Skip to content

Commit 7d784c5

Browse files
committed
cleanup after merge
1 parent 1f6f59c commit 7d784c5

2 files changed

Lines changed: 11 additions & 20 deletions

File tree

generated/secondlife.d.luau

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -429,15 +429,6 @@ declare llbase64: {
429429
}
430430

431431

432-
---------------------------
433-
-- Global Table: llhttp
434-
---------------------------
435-
436-
declare llhttp: {
437-
request: (url: string, params: HttpRequestParams?, body: string?) -> uuid,
438-
}
439-
440-
441432
---------------------------
442433
-- Global Table: lljson
443434
---------------------------
@@ -890,7 +881,7 @@ declare ll: {
890881
GroundRepel: (height: number, water: boolean | number, tau: number) -> (),
891882
GroundSlope: (offset: vector) -> vector,
892883
HMAC: (private_key: string, msg: string, algorithm: string) -> string,
893-
HTTPRequest: (url: string, parameters: list, body: string) -> uuid,
884+
HTTPRequest: (url: string, parameters: list | HttpRequestParams, body: string) -> uuid,
894885
HTTPResponse: (request_id: uuid, status: number, body: string) -> (),
895886
Hash: (val: string) -> number,
896887
InsertString: (dst: string, index: number, src: string) -> string,
@@ -907,7 +898,7 @@ declare ll: {
907898
KeysKeyValue: (first: number, count: number) -> uuid,
908899
Linear2sRGB: (color: vector) -> vector,
909900
LinkAdjustSoundVolume: (link: number, volume: number) -> (),
910-
LinkParticleSystem: (link: number, rules: list) -> (),
901+
LinkParticleSystem: (link: number, rules: list | ParticleParams) -> (),
911902
LinkPlaySound: (link: number, sound: string | uuid, volume: number, flags: number) -> (),
912903
LinkSetSoundQueueing: (link: number, queue: boolean | number) -> (),
913904
LinkSetSoundRadius: (link: number, radius: number) -> (),
@@ -981,7 +972,7 @@ declare ll: {
981972
ParcelMediaQuery: (query: {number}) -> {any},
982973
ParseString2List: (src: string, separators: {string}, spacers: {string}) -> {string},
983974
ParseStringKeepNulls: (src: string, separators: {string}, spacers: {string}) -> {string},
984-
ParticleSystem: (rules: list) -> (),
975+
ParticleSystem: (rules: list | ParticleParams) -> (),
985976
PassCollisions: (pass: number) -> (),
986977
PassTouches: (pass: number) -> (),
987978
PatrolPoints: (patrolPoints: {vector}, options: list) -> (),
@@ -1076,7 +1067,7 @@ declare ll: {
10761067
SetLinkCamera: (link: number, eye: vector, at: vector) -> (),
10771068
SetLinkColor: (link: number, color: vector, face: number) -> (),
10781069
SetLinkGLTFOverrides: (link: number, face: number, params: list) -> (),
1079-
SetLinkMedia: (link: number, face: number, params: list) -> number,
1070+
SetLinkMedia: (link: number, face: number, params: list | MediaParams) -> number,
10801071
SetLinkPrimitiveParams: @[deprecated {use='ll.SetLinkPrimitiveParamsFast'}](link: number, rules: list) -> (),
10811072
SetLinkPrimitiveParamsFast: (link: number, rules: list) -> (),
10821073
SetLinkRenderMaterial: (link: number, material: string | uuid, face: number) -> (),
@@ -1092,7 +1083,7 @@ declare ll: {
10921083
SetPayPrice: (price: number, quick_pay_buttons: {number}) -> (),
10931084
SetPhysicsMaterial: (mask: number, gravity_multiplier: number, restitution: number, friction: number, density: number) -> (),
10941085
SetPos: (pos: vector) -> (),
1095-
SetPrimMediaParams: (face: number, params: list) -> number,
1086+
SetPrimMediaParams: (face: number, params: list | MediaParams) -> number,
10961087
SetPrimURL: @[deprecated {use='ll.SetPrimMediaParams'}](url: string) -> (),
10971088
SetPrimitiveParams: @[deprecated {use='ll.SetLinkPrimitiveParamsFast'}](rules: list) -> (),
10981089
SetRegionPos: (position: vector) -> boolean,
@@ -1414,7 +1405,7 @@ declare llcompat: {
14141405
GroundRepel: @deprecated (height: number, water: boolean | number, tau: number) -> (),
14151406
GroundSlope: @deprecated (offset: vector) -> vector,
14161407
HMAC: @deprecated (private_key: string, msg: string, algorithm: string) -> string,
1417-
HTTPRequest: @deprecated (url: string, parameters: list, body: string) -> uuid,
1408+
HTTPRequest: @deprecated (url: string, parameters: list | HttpRequestParams, body: string) -> uuid,
14181409
HTTPResponse: @deprecated (request_id: uuid, status: number, body: string) -> (),
14191410
Hash: @deprecated (val: string) -> number,
14201411
InsertString: @deprecated (dst: string, index: number, src: string) -> string,
@@ -1431,7 +1422,7 @@ declare llcompat: {
14311422
KeysKeyValue: @deprecated (first: number, count: number) -> uuid,
14321423
Linear2sRGB: @deprecated (color: vector) -> vector,
14331424
LinkAdjustSoundVolume: @deprecated (link: number, volume: number) -> (),
1434-
LinkParticleSystem: @deprecated (link: number, rules: list) -> (),
1425+
LinkParticleSystem: @deprecated (link: number, rules: list | ParticleParams) -> (),
14351426
LinkPlaySound: @deprecated (link: number, sound: string | uuid, volume: number, flags: number) -> (),
14361427
LinkSetSoundQueueing: @deprecated (link: number, queue: boolean | number) -> (),
14371428
LinkSetSoundRadius: @deprecated (link: number, radius: number) -> (),
@@ -1505,7 +1496,7 @@ declare llcompat: {
15051496
ParcelMediaQuery: @deprecated (query: {number}) -> {any},
15061497
ParseString2List: @deprecated (src: string, separators: {string}, spacers: {string}) -> {string},
15071498
ParseStringKeepNulls: @deprecated (src: string, separators: {string}, spacers: {string}) -> {string},
1508-
ParticleSystem: @deprecated (rules: list) -> (),
1499+
ParticleSystem: @deprecated (rules: list | ParticleParams) -> (),
15091500
PassCollisions: @deprecated (pass: number) -> (),
15101501
PassTouches: @deprecated (pass: number) -> (),
15111502
PatrolPoints: @deprecated (patrolPoints: {vector}, options: list) -> (),
@@ -1601,7 +1592,7 @@ declare llcompat: {
16011592
SetLinkCamera: @deprecated (link: number, eye: vector, at: vector) -> (),
16021593
SetLinkColor: @deprecated (link: number, color: vector, face: number) -> (),
16031594
SetLinkGLTFOverrides: @deprecated (link: number, face: number, params: list) -> (),
1604-
SetLinkMedia: @deprecated (link: number, face: number, params: list) -> number,
1595+
SetLinkMedia: @deprecated (link: number, face: number, params: list | MediaParams) -> number,
16051596
SetLinkPrimitiveParams: @deprecated (link: number, rules: list) -> (),
16061597
SetLinkPrimitiveParamsFast: @deprecated (link: number, rules: list) -> (),
16071598
SetLinkRenderMaterial: @deprecated (link: number, material: string | uuid, face: number) -> (),
@@ -1618,7 +1609,7 @@ declare llcompat: {
16181609
SetPayPrice: @deprecated (price: number, quick_pay_buttons: {number}) -> (),
16191610
SetPhysicsMaterial: @deprecated (mask: number, gravity_multiplier: number, restitution: number, friction: number, density: number) -> (),
16201611
SetPos: @deprecated (pos: vector) -> (),
1621-
SetPrimMediaParams: @deprecated (face: number, params: list) -> number,
1612+
SetPrimMediaParams: @deprecated (face: number, params: list | MediaParams) -> number,
16221613
SetPrimURL: @deprecated (url: string) -> (),
16231614
SetPrimitiveParams: @deprecated (rules: list) -> (),
16241615
SetRegionPos: @deprecated (position: vector) -> number,

lsl_definitions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14503,7 +14503,7 @@ functions:
1450314503
tooltip: A list of particle system rules and data pairs [rule1, data1, ...].
1450414504
type: list
1450514505
param-semantics: ParticleParam
14506-
ruleset: particle-params
14506+
ruleset: particle-params
1450714507
energy: 10.0
1450814508
func-id: 229
1450914509
return: void

0 commit comments

Comments
 (0)