Skip to content

Commit 838a728

Browse files
authored
Merge branch 'main' into constants-param-lists
2 parents 5c69748 + 8a5eefc commit 838a728

11 files changed

Lines changed: 4272 additions & 3948 deletions

generated/experimental/category_docs.yaml

Lines changed: 1344 additions & 1344 deletions
Large diffs are not rendered by default.

generated/lsl_keywords_pretty.xml

Lines changed: 757 additions & 757 deletions
Large diffs are not rendered by default.

generated/lua_keywords_pretty.xml

Lines changed: 830 additions & 830 deletions
Large diffs are not rendered by default.

generated/secondlife.docs.json

Lines changed: 42 additions & 42 deletions
Large diffs are not rendered by default.

generated/secondlife_selene.yml

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -449,23 +449,23 @@ globals:
449449
CHANGED_ALLOWED_DROP:
450450
property: read-only
451451
type: number
452-
description: The object inventory changed because a user other than the owner
453-
(or the owner if the object is no-mod) added an item. This is only possible
454-
if enabled via llAllowInventoryDrop.
452+
description: Object inventory changed because a user other than the owner (or
453+
the owner if the object is no-mod) added an item. This is only possible if enabled
454+
via llAllowInventoryDrop.
455455
CHANGED_COLOR:
456456
property: read-only
457457
type: number
458-
description: The object's Blinn-Phong color or alpha parameters have changed.
458+
description: Object's Blinn-Phong color or alpha parameters have changed.
459459
CHANGED_INVENTORY:
460460
property: read-only
461461
type: number
462-
description: The prim inventory has changed by someone who has modification rights
462+
description: Prim inventory has changed by someone who has modification rights
463463
to it.
464464
CHANGED_LINK:
465465
property: read-only
466466
type: number
467-
description: The number of prims making up the object or avatars seated on it
468-
has changed. Also occurs when duplicating a linked object or when a prim changes
467+
description: Number of prims making up the object or avatars seated on it has
468+
changed. Also occurs when duplicating a linked object or when a prim changes
469469
type or shape. Does not trigger on attach/detach, sit/unsit in attachments,
470470
or single prim duplication.
471471
CHANGED_MEDIA:
@@ -475,45 +475,45 @@ globals:
475475
CHANGED_OWNER:
476476
property: read-only
477477
type: number
478-
description: The object has changed owners. Triggers in the original object when
479-
a user takes it, copies it, or deeds it to a group, and in the new object when
478+
description: Object has changed owners. Triggers in the original object when a
479+
user takes it, copies it, or deeds it to a group, and in the new object when
480480
it is first rezzed.
481481
CHANGED_REGION:
482482
property: read-only
483483
type: number
484-
description: The object has changed regions by crossing a boundary or teleporting
484+
description: Object has changed regions by crossing a boundary or teleporting
485485
(if attached). Triggers only in the root prim of a linkset.
486486
CHANGED_REGION_START:
487487
property: read-only
488488
type: number
489-
description: The region containing this object has just come online.
489+
description: Region containing this object has just come online.
490490
CHANGED_RENDER_MATERIAL:
491491
property: read-only
492492
type: number
493-
description: The render material (prim material ID or material overrides) has
494-
changed on one or more faces.
493+
description: Render material (prim material ID or material overrides) has changed
494+
on one or more faces.
495495
CHANGED_SCALE:
496496
property: read-only
497497
type: number
498-
description: The prim scale of at least one prim in the linked object has changed.
498+
description: Prim scale of at least one prim in the linked object has changed.
499499
Only the root prim receives this event.
500500
CHANGED_SHAPE:
501501
property: read-only
502502
type: number
503-
description: The prim base shape (PRIM_TYPE, such as box, prism, torus, taper,
504-
twist, or cut) has changed.
503+
description: Prim base shape (PRIM_TYPE, such as box, prism, torus, taper, twist,
504+
or cut) has changed.
505505
CHANGED_TELEPORT:
506506
property: read-only
507507
type: number
508-
description: The avatar this object is attached to has teleported. Triggers only
509-
in the root prim of an attachment. Does not occur for child prims or 'sit teleports'.
508+
description: Avatar this object is attached to has teleported. Triggers only in
509+
the root prim of an attachment. Does not occur for child prims or 'sit teleports'.
510510
If scripts are disabled at the destination, the event queues and triggers after
511511
moving to a script-enabled parcel.
512512
CHANGED_TEXTURE:
513513
property: read-only
514514
type: number
515-
description: The prim texture parameters (shine/bump settings, repeats, flip,
516-
rotation, offset, or texture) have changed.
515+
description: Prim texture parameters (shine/bump settings, repeats, flip, rotation,
516+
offset, or texture) have changed.
517517
CHARACTER_ACCOUNT_FOR_SKIPPED_FRAMES:
518518
property: read-only
519519
type: number
@@ -683,9 +683,9 @@ globals:
683683
on this channel can monitor the combat log.
684684
COMBAT_LOG_ID:
685685
struct: uuid
686-
description: The ID used by all combat log messages sent from the region to the
687-
COMBAT_CHANNEL. Scripts can filter llListen calls with this ID to receive only
688-
system-generated combat log messages.
686+
description: ID used by all combat log messages sent from the region to the COMBAT_CHANNEL.
687+
Scripts can filter llListen calls with this ID to receive only system-generated
688+
combat log messages.
689689
CONTENT_TYPE_ATOM:
690690
property: read-only
691691
type: number
@@ -901,7 +901,7 @@ globals:
901901
DEG_TO_RAD:
902902
property: read-only
903903
type: number
904-
description: The constant 0.017453293 (precise value is PI/180). Multiply a value
904+
description: Constant 0.017453293 (precise value is PI/180). Multiply a value
905905
in degrees by this number to convert it to radians.
906906
DENSITY:
907907
property: read-only
@@ -947,30 +947,29 @@ globals:
947947
ENV_NO_ENVIRONMENT:
948948
property: read-only
949949
type: number
950-
description: The environmental settings inventory object could not be found, or
951-
there is no environment on this parcel to modify.
950+
description: Environmental settings inventory object could not be found, or there
951+
is no environment on this parcel to modify.
952952
ENV_NO_EXPERIENCE_LAND:
953953
property: read-only
954954
type: number
955-
description: The experience has not been enabled or cannot run on the land.
955+
description: Experience has not been enabled or cannot run on the land.
956956
ENV_NO_EXPERIENCE_PERMISSION:
957957
property: read-only
958958
type: number
959-
description: The agent has not granted permission to change environments.
959+
description: Agent has not granted permission to change environments.
960960
ENV_NO_PERMISSIONS:
961961
property: read-only
962962
type: number
963-
description: The script lacks permissions to modify the environment at this location,
963+
description: Script lacks permissions to modify the environment at this location,
964964
or an attempt was made to remove altitude track 0 or 1.
965965
ENV_OK:
966966
property: read-only
967967
type: number
968-
description: The agent, parcel, or region will attempt to change the applied environment.
968+
description: Agent, parcel, or region will attempt to change the applied environment.
969969
ENV_THROTTLE:
970970
property: read-only
971971
type: number
972-
description: The scripts have exceeded the throttle limit. Wait and retry the
973-
request.
972+
description: Scripts have exceeded the throttle limit. Wait and retry the request.
974973
ENV_VALIDATION_FAIL:
975974
property: read-only
976975
type: number
@@ -2486,9 +2485,9 @@ globals:
24862485
PI:
24872486
property: read-only
24882487
type: number
2489-
description: The mathematical constant Pi (3.14159265), representing the number
2490-
of radians in a half circle (semi-circle). When used in sensor functions, it
2491-
specifies a full sphere scan.
2488+
description: Mathematical constant Pi (3.14159265), representing the number of
2489+
radians in a half circle (semi-circle). When used in sensor functions, it specifies
2490+
a full sphere scan.
24922491
PING_PONG:
24932492
property: read-only
24942493
type: number
@@ -2497,9 +2496,8 @@ globals:
24972496
PI_BY_TWO:
24982497
property: read-only
24992498
type: number
2500-
description: The constant Pi/2 (1.57079633), representing the number of radians
2501-
in a quarter circle. When used in sensor functions, it specifies a hemisphere
2502-
scan.
2499+
description: Constant Pi/2 (1.57079633), representing the number of radians in
2500+
a quarter circle. When used in sensor functions, it specifies a hemisphere scan.
25032501
PRIM_ALLOW_UNSIT:
25042502
property: read-only
25052503
type: number
@@ -3547,8 +3545,8 @@ globals:
35473545
RAD_TO_DEG:
35483546
property: read-only
35493547
type: number
3550-
description: The constant 57.2957795 (precise value is 180/PI). Multiply a value
3551-
in radians by this number to convert it to degrees.
3548+
description: Constant 57.2957795 (precise value is 180/PI). Multiply a value in
3549+
radians by this number to convert it to degrees.
35523550
RCERR_CAST_TIME_EXCEEDED:
35533551
property: read-only
35543552
type: number
@@ -4119,7 +4117,7 @@ globals:
41194117
SQRT2:
41204118
property: read-only
41214119
type: number
4122-
description: The mathematical constant representing the square root of 2 (1.41421356).
4120+
description: Mathematical constant representing the square root of 2 (1.41421356).
41234121
STATUS_BLOCK_GRAB:
41244122
property: read-only
41254123
type: number
@@ -4369,19 +4367,19 @@ globals:
43694367
works for PBR textures.
43704368
TEXTURE_BLANK:
43714369
struct: uuid
4372-
description: The asset UUID representing the default 'Blank' texture.
4370+
description: Asset UUID representing the default 'Blank' texture.
43734371
TEXTURE_DEFAULT:
43744372
struct: uuid
43754373
TEXTURE_MEDIA:
43764374
struct: uuid
4377-
description: The asset UUID representing the default 'Default Media' texture.
4375+
description: Asset UUID representing the default 'Default Media' texture.
43784376
TEXTURE_PLYWOOD:
43794377
struct: uuid
4380-
description: The asset UUID representing the default 'Plywood' texture.
4378+
description: Asset UUID representing the default 'Plywood' texture.
43814379
TEXTURE_TRANSPARENT:
43824380
struct: uuid
4383-
description: The asset UUID representing the '*Default Transparent Texture' in
4384-
the library (included with viewers).
4381+
description: Asset UUID representing the '*Default Transparent Texture' in the
4382+
library (included with viewers).
43854383
TOUCH_INVALID_FACE:
43864384
property: read-only
43874385
type: number
@@ -4491,8 +4489,8 @@ globals:
44914489
TWO_PI:
44924490
property: read-only
44934491
type: number
4494-
description: The mathematical constant representing the number of radians in a
4495-
full circle (6.28318530, twice the value of PI).
4492+
description: Mathematical constant representing the number of radians in a full
4493+
circle (6.28318530, twice the value of PI).
44964494
TYPE_FLOAT:
44974495
property: read-only
44984496
type: number
@@ -4807,39 +4805,39 @@ globals:
48074805
XP_ERROR_EXPERIENCES_DISABLED:
48084806
property: read-only
48094807
type: number
4810-
description: The region currently has experiences disabled.
4808+
description: Region currently has experiences disabled.
48114809
XP_ERROR_EXPERIENCE_DISABLED:
48124810
property: read-only
48134811
type: number
4814-
description: The experience owner has temporarily disabled the experience.
4812+
description: Experience owner has temporarily disabled the experience.
48154813
XP_ERROR_EXPERIENCE_SUSPENDED:
48164814
property: read-only
48174815
type: number
4818-
description: The experience has been suspended by Linden Lab customer support.
4816+
description: Experience has been suspended by Linden Lab customer support.
48194817
XP_ERROR_INVALID_EXPERIENCE:
48204818
property: read-only
48214819
type: number
4822-
description: The script is associated with an experience that no longer exists.
4820+
description: Script is associated with an experience that no longer exists.
48234821
XP_ERROR_INVALID_PARAMETERS:
48244822
property: read-only
48254823
type: number
48264824
description: One of the string arguments was too big to fit in the key-value store.
48274825
XP_ERROR_KEY_NOT_FOUND:
48284826
property: read-only
48294827
type: number
4830-
description: The requested key does not exist.
4828+
description: Requested key does not exist.
48314829
XP_ERROR_MATURITY_EXCEEDED:
48324830
property: read-only
48334831
type: number
4834-
description: The content rating of the experience exceeds that of the region.
4832+
description: Content rating of the experience exceeds that of the region.
48354833
XP_ERROR_NONE:
48364834
property: read-only
48374835
type: number
48384836
description: No error was detected.
48394837
XP_ERROR_NOT_FOUND:
48404838
property: read-only
48414839
type: number
4842-
description: The sim was unable to verify the validity of the experience. Retrying
4840+
description: Sim was unable to verify the validity of the experience. Retrying
48434841
after a short wait is advised.
48444842
XP_ERROR_NOT_PERMITTED:
48454843
property: read-only
@@ -4849,8 +4847,8 @@ globals:
48494847
XP_ERROR_NOT_PERMITTED_LAND:
48504848
property: read-only
48514849
type: number
4852-
description: The experience is blocked or not enabled for this land, or is not
4853-
allowed to run in the current region.
4850+
description: Experience is blocked or not enabled for this land, or is not allowed
4851+
to run in the current region.
48544852
XP_ERROR_NO_EXPERIENCE:
48554853
property: read-only
48564854
type: number
@@ -4863,8 +4861,8 @@ globals:
48634861
XP_ERROR_REQUEST_PERM_TIMEOUT:
48644862
property: read-only
48654863
type: number
4866-
description: The request for experience permissions was ignored and the request
4867-
timed out without modification.
4864+
description: Request for experience permissions was ignored and the request timed
4865+
out without modification.
48684866
XP_ERROR_RETRY_UPDATE:
48694867
property: read-only
48704868
type: number
@@ -4877,11 +4875,11 @@ globals:
48774875
XP_ERROR_STORE_DISABLED:
48784876
property: read-only
48794877
type: number
4880-
description: The key-value store is currently disabled on this region.
4878+
description: Key-value store is currently disabled on this region.
48814879
XP_ERROR_THROTTLED:
48824880
property: read-only
48834881
type: number
4884-
description: The call failed due to too many recent calls.
4882+
description: Call failed due to too many recent calls.
48854883
XP_ERROR_UNKNOWN_ERROR:
48864884
property: read-only
48874885
type: number
@@ -4897,7 +4895,7 @@ globals:
48974895
value for vector variables.
48984896
_G:
48994897
property: read-only
4900-
description: The table of Lua builtin globals.
4898+
description: Table of Lua builtin globals.
49014899
_VERSION:
49024900
property: read-only
49034901
type: string
@@ -5510,7 +5508,7 @@ globals:
55105508
math.pi:
55115509
property: read-only
55125510
type: number
5513-
description: The value of pi
5511+
description: Value of pi
55145512
math.huge:
55155513
property: read-only
55165514
type: number

generated/syntax/slua.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
</dict>
240240
<dict>
241241
<key>match</key>
242-
<string>\b(__(?:add|call|concat|div|eq|index|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tostring|unm|iter|idiv|tojson|jsonhint))\b</string>
242+
<string>\b(__(?:add|call|concat|div|eq|idiv|index|iter|jsonhint|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tojson|tostring|unm))\b</string>
243243
<key>name</key>
244244
<string>variable.language.metamethod.luau</string>
245245
</dict>
@@ -717,7 +717,7 @@
717717
<key>name</key>
718718
<string>variable.language.metamethod.luau</string>
719719
<key>match</key>
720-
<string>(?&lt;=[^.]\.|:)\b(__(?:add|call|concat|div|eq|index|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tostring|unm|iter|idiv|tojson|jsonhint))\b</string>
720+
<string>(?&lt;=[^.]\.|:)\b(__(?:add|call|concat|div|eq|idiv|index|iter|jsonhint|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tojson|tostring|unm))\b</string>
721721
</dict>
722722
<dict>
723723
<key>name</key>

generated/syntax/slua.tmLanguage.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
]
163163
},
164164
{
165-
"match": "\\b(__(?:add|call|concat|div|eq|index|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tostring|unm|iter|idiv|tojson|jsonhint))\\b",
165+
"match": "\\b(__(?:add|call|concat|div|eq|idiv|index|iter|jsonhint|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tojson|tostring|unm))\\b",
166166
"name": "variable.language.metamethod.luau"
167167
},
168168
{
@@ -418,7 +418,7 @@
418418
},
419419
{
420420
"name": "variable.language.metamethod.luau",
421-
"match": "(?<=[^.]\\.|:)\\b(__(?:add|call|concat|div|eq|index|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tostring|unm|iter|idiv|tojson|jsonhint))\\b"
421+
"match": "(?<=[^.]\\.|:)\\b(__(?:add|call|concat|div|eq|idiv|index|iter|jsonhint|le|len|lt|metatable|mod|mode|mul|newindex|pow|sub|tojson|tostring|unm))\\b"
422422
},
423423
{
424424
"name": "keyword.other.unit.luau",

0 commit comments

Comments
 (0)