Skip to content

Commit b2c6aea

Browse files
authored
Merge pull request #153 from tapple/wiki-text-attachments
Improve documentation for attachment functions
2 parents f47e987 + ecd10ef commit b2c6aea

9 files changed

Lines changed: 50 additions & 52 deletions

generated/builtins.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ const rotation ZERO_ROTATION = <0.0, 0.0, 0.0, 1.0>
15551555
const vector ZERO_VECTOR = <0.0, 0.0, 0.0>
15561556
event at_rot_target( integer handle, rotation targetrot, rotation ourrot )
15571557
event at_target( integer tnum, vector targetpos, vector ourpos )
1558-
event attach( key id )
1558+
event attach( key avatar )
15591559
event changed( integer changes )
15601560
event collision( integer num_detected )
15611561
event collision_end( integer num_detected )

generated/experimental/category_docs.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ asset_permissions:
2525
options: Extra options applied to the transfer (currently unused).
2626
tooltip: Transfers ownership of the object (or a copy of it, depending on Flags) to the specified agent. Returns an integer indicating the success or failure of the transfer.
2727
attachments:
28-
attach( key id ):
29-
id: UUID of the avatar the object is attached to, or NULL_KEY if detached.
30-
tooltip: Triggered whenever the object is attached to or detached from an avatar. Passes the UUID key of the avatar (id) if attached, or NULL_KEY if detached.
28+
attach( key avatar ):
29+
avatar: UUID of the avatar the object is attached to, or NULL_KEY if detached.
30+
tooltip: Triggered whenever the object is attached to or detached from an avatar. Passes the UUID key of the avatar if attached, or NULL_KEY if detached.
3131
llAttachToAvatar( integer attach_point ) -> void:
3232
attach_point: ATTACH_* constant or integer value representing the target attachment point.
3333
tooltip: Attaches the object to the avatar who has granted the PERMISSION_ATTACH permission. Takes the object into the user's inventory and attaches it at attach_point.
@@ -42,12 +42,12 @@ attachments:
4242
tooltip: Returns the integer attachment point (an ATTACH_* constant) that the object is attached to, or 0 if it is unattached or pending detachment.
4343
llGetAttachedList( key avatar ) -> list:
4444
avatar: UUID of the avatar in the same region.
45-
tooltip: Returns a list of object keys (UUIDs) corresponding to public, visible (non-HUD) attachments worn by the specified avatar, in the order they were attached. Returns a list with an error message
46-
string on failure.
45+
tooltip: Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached. HUDs are not included because they are neither public nor visible. Returns a list containing
46+
an error message string on failure.
4747
llGetAttachedListFiltered( key avatar, list options ) -> list:
4848
avatar: UUID of the avatar in the same region.
4949
options: A list of options to filter the returned attachments.
50-
tooltip: Retrieves a list of attachment object keys worn by avatar in the order they were attached, filtered by options. Returns a list containing an error message string on failure.
50+
tooltip: Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached, filtered by options. Returns a list containing an error message string on failure.
5151
avatar:
5252
control( key id, integer level, integer edge ):
5353
id: UUID of the avatar whose inputs are captured.
@@ -117,12 +117,12 @@ avatar:
117117
tooltip: Returns a string representing the name of the animation currently overriding the specified anim_state. Requires the PERMISSION_OVERRIDE_ANIMATIONS or PERMISSION_TRIGGER_ANIMATION runtime permission.
118118
llGetAttachedList( key avatar ) -> list:
119119
avatar: UUID of the avatar in the same region.
120-
tooltip: Returns a list of object keys (UUIDs) corresponding to public, visible (non-HUD) attachments worn by the specified avatar, in the order they were attached. Returns a list with an error message
121-
string on failure.
120+
tooltip: Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached. HUDs are not included because they are neither public nor visible. Returns a list containing
121+
an error message string on failure.
122122
llGetAttachedListFiltered( key avatar, list options ) -> list:
123123
avatar: UUID of the avatar in the same region.
124124
options: A list of options to filter the returned attachments.
125-
tooltip: Retrieves a list of attachment object keys worn by avatar in the order they were attached, filtered by options. Returns a list containing an error message string on failure.
125+
tooltip: Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached, filtered by options. Returns a list containing an error message string on failure.
126126
llGetCameraAspect( ) -> float:
127127
tooltip: Returns a float representing the camera's current aspect ratio (width/height) of the agent who granted PERMISSION_TRACK_CAMERA. Returns 0.0 if permissions are not granted.
128128
llGetCameraFOV( ) -> float:

generated/experimental/category_functions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ asset_permissions:
77
- llSetObjectPermMask( integer group, integer flags ) -> void
88
- llTransferOwnership( key agent, integer flags, list options ) -> integer
99
attachments:
10-
- attach( key id )
10+
- attach( key avatar )
1111
- llAttachToAvatar( integer attach_point ) -> void
1212
- llAttachToAvatarTemp( integer attach_point ) -> void
1313
- llDetachFromAvatar( ) -> void

generated/lsl_keywords_pretty.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9374,7 +9374,7 @@ If another state is defined before the default state, the compiler will report a
93749374
<key>arguments</key>
93759375
<array>
93769376
<map>
9377-
<key>id</key>
9377+
<key>avatar</key>
93789378
<map>
93799379
<key>tooltip</key>
93809380
<string>UUID of the avatar the object is attached to, or NULL_KEY if detached.</string>
@@ -9384,7 +9384,7 @@ If another state is defined before the default state, the compiler will report a
93849384
</map>
93859385
</array>
93869386
<key>tooltip</key>
9387-
<string>Triggered whenever the object is attached to or detached from an avatar. Passes the UUID key of the avatar (id) if attached, or NULL_KEY if detached.</string>
9387+
<string>Triggered whenever the object is attached to or detached from an avatar. Passes the UUID key of the avatar if attached, or NULL_KEY if detached.</string>
93889388
</map>
93899389
<key>changed</key>
93909390
<map>
@@ -12795,7 +12795,7 @@ If another state is defined before the default state, the compiler will report a
1279512795
<key>sleep</key>
1279612796
<real>0.0</real>
1279712797
<key>tooltip</key>
12798-
<string>Returns a list of object keys (UUIDs) corresponding to public, visible (non-HUD) attachments worn by the specified avatar, in the order they were attached. Returns a list with an error message string on failure.</string>
12798+
<string>Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached. HUDs are not included because they are neither public nor visible. Returns a list containing an error message string on failure.</string>
1279912799
</map>
1280012800
<key>llGetAttachedListFiltered</key>
1280112801
<map>
@@ -12827,7 +12827,7 @@ If another state is defined before the default state, the compiler will report a
1282712827
<key>sleep</key>
1282812828
<real>0.0</real>
1282912829
<key>tooltip</key>
12830-
<string>Retrieves a list of attachment object keys worn by avatar in the order they were attached, filtered by options. Returns a list containing an error message string on failure.</string>
12830+
<string>Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached, filtered by options. Returns a list containing an error message string on failure.</string>
1283112831
</map>
1283212832
<key>llGetBoundingBox</key>
1283312833
<map>

generated/lua_keywords_pretty.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9679,7 +9679,7 @@ float falloff – ranges from 0.01 to 2.0
96799679
<key>arguments</key>
96809680
<array>
96819681
<map>
9682-
<key>id</key>
9682+
<key>avatar</key>
96839683
<map>
96849684
<key>tooltip</key>
96859685
<string>UUID of the avatar the object is attached to, or NULL_KEY if detached.</string>
@@ -9689,7 +9689,7 @@ float falloff – ranges from 0.01 to 2.0
96899689
</map>
96909690
</array>
96919691
<key>tooltip</key>
9692-
<string>Triggered whenever the object is attached to or detached from an avatar. Passes the UUID key of the avatar (id) if attached, or NULL_KEY if detached.</string>
9692+
<string>Triggered whenever the object is attached to or detached from an avatar. Passes the UUID key of the avatar if attached, or NULL_KEY if detached.</string>
96939693
</map>
96949694
<key>changed</key>
96959695
<map>
@@ -19492,7 +19492,7 @@ Returns true if result is non-zero.</string>
1949219492
<key>sleep</key>
1949319493
<real>0.0</real>
1949419494
<key>tooltip</key>
19495-
<string>Returns a list of object keys (UUIDs) corresponding to public, visible (non-HUD) attachments worn by the specified avatar, in the order they were attached. Returns a list with an error message string on failure.</string>
19495+
<string>Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached. HUDs are not included because they are neither public nor visible. Returns a list containing an error message string on failure.</string>
1949619496
</map>
1949719497
<key>ll.GetAttachedListFiltered</key>
1949819498
<map>
@@ -19524,7 +19524,7 @@ Returns true if result is non-zero.</string>
1952419524
<key>sleep</key>
1952519525
<real>0.0</real>
1952619526
<key>tooltip</key>
19527-
<string>Retrieves a list of attachment object keys worn by avatar in the order they were attached, filtered by options. Returns a list containing an error message string on failure.</string>
19527+
<string>Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached, filtered by options. Returns a list containing an error message string on failure.</string>
1952819528
</map>
1952919529
<key>ll.GetBoundingBox</key>
1953019530
<map>

generated/secondlife.d.luau

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ end
182182
declare extern type LLEvents with
183183
at_rot_target: ((handle: number, targetrot: quaternion, ourrot: quaternion) -> ())?
184184
at_target: ((tnum: number, targetpos: vector, ourpos: vector) -> ())?
185-
attach: ((id: uuid) -> ())?
185+
attach: ((avatar: uuid) -> ())?
186186
changed: ((changes: number) -> ())?
187187
collision: LLDetectedEventHandler?
188188
collision_end: LLDetectedEventHandler?

generated/secondlife.docs.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,11 +1283,11 @@
12831283
"learn_more_link": "https://wiki.secondlife.com/wiki/LlGetAttached"
12841284
},
12851285
"@sl-slua/global/ll.GetAttachedList": {
1286-
"documentation": "Returns a list of object keys (UUIDs) corresponding to public, visible (non-HUD) attachments worn by the specified avatar, in the order they were attached. Returns a list with an error message string on failure.",
1286+
"documentation": "Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached. HUDs are not included because they are neither public nor visible. Returns a list containing an error message string on failure.",
12871287
"learn_more_link": "https://wiki.secondlife.com/wiki/LlGetAttachedList"
12881288
},
12891289
"@sl-slua/global/ll.GetAttachedListFiltered": {
1290-
"documentation": "Retrieves a list of attachment object keys worn by avatar in the order they were attached, filtered by options. Returns a list containing an error message string on failure.",
1290+
"documentation": "Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached, filtered by options. Returns a list containing an error message string on failure.",
12911291
"learn_more_link": "https://wiki.secondlife.com/wiki/LlGetAttachedListFiltered"
12921292
},
12931293
"@sl-slua/global/ll.GetBoundingBox": {
@@ -3350,11 +3350,11 @@
33503350
"learn_more_link": "https://wiki.secondlife.com/wiki/LlGetAttached"
33513351
},
33523352
"@sl-slua/global/llcompat.GetAttachedList": {
3353-
"documentation": "Returns a list of object keys (UUIDs) corresponding to public, visible (non-HUD) attachments worn by the specified avatar, in the order they were attached. Returns a list with an error message string on failure.",
3353+
"documentation": "Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached. HUDs are not included because they are neither public nor visible. Returns a list containing an error message string on failure.",
33543354
"learn_more_link": "https://wiki.secondlife.com/wiki/LlGetAttachedList"
33553355
},
33563356
"@sl-slua/global/llcompat.GetAttachedListFiltered": {
3357-
"documentation": "Retrieves a list of attachment object keys worn by avatar in the order they were attached, filtered by options. Returns a list containing an error message string on failure.",
3357+
"documentation": "Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were attached, filtered by options. Returns a list containing an error message string on failure.",
33583358
"learn_more_link": "https://wiki.secondlife.com/wiki/LlGetAttachedListFiltered"
33593359
},
33603360
"@sl-slua/global/llcompat.GetBoundingBox": {

generated/secondlife_selene.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7153,18 +7153,18 @@ globals:
71537153
- type:
71547154
display: uuid
71557155
must_use: true
7156-
description: Returns a list of object keys (UUIDs) corresponding to public, visible
7157-
(non-HUD) attachments worn by the specified avatar, in the order they were attached.
7158-
Returns a list with an error message string on failure.
7156+
description: Returns a list of object keys (UUIDs) worn by the specified avatar,
7157+
in the order they were attached. HUDs are not included because they are neither
7158+
public nor visible. Returns a list containing an error message string on failure.
71597159
ll.GetAttachedListFiltered:
71607160
args:
71617161
- type:
71627162
display: uuid
71637163
- type: table
71647164
must_use: true
7165-
description: Retrieves a list of attachment object keys worn by avatar in the
7166-
order they were attached, filtered by options. Returns a list containing an
7167-
error message string on failure.
7165+
description: Returns a list of object keys (UUIDs) worn by the specified avatar,
7166+
in the order they were attached, filtered by options. Returns a list containing
7167+
an error message string on failure.
71687168
ll.GetBoundingBox:
71697169
args:
71707170
- type:
@@ -11209,29 +11209,29 @@ globals:
1120911209
the object is attached to, or 0 if it is unattached or pending detachment.
1121011210
llcompat.GetAttachedList:
1121111211
deprecated:
11212-
message: Returns a list of object keys (UUIDs) corresponding to public, visible
11213-
(non-HUD) attachments worn by the specified avatar, in the order they were
11214-
attached. Returns a list with an error message string on failure.
11212+
message: Returns a list of object keys (UUIDs) worn by the specified avatar,
11213+
in the order they were attached. HUDs are not included because they are neither
11214+
public nor visible. Returns a list containing an error message string on failure.
1121511215
args:
1121611216
- type:
1121711217
display: uuid
1121811218
must_use: true
11219-
description: Returns a list of object keys (UUIDs) corresponding to public, visible
11220-
(non-HUD) attachments worn by the specified avatar, in the order they were attached.
11221-
Returns a list with an error message string on failure.
11219+
description: Returns a list of object keys (UUIDs) worn by the specified avatar,
11220+
in the order they were attached. HUDs are not included because they are neither
11221+
public nor visible. Returns a list containing an error message string on failure.
1122211222
llcompat.GetAttachedListFiltered:
1122311223
deprecated:
11224-
message: Retrieves a list of attachment object keys worn by avatar in the order
11225-
they were attached, filtered by options. Returns a list containing an error
11226-
message string on failure.
11224+
message: Returns a list of object keys (UUIDs) worn by the specified avatar,
11225+
in the order they were attached, filtered by options. Returns a list containing
11226+
an error message string on failure.
1122711227
args:
1122811228
- type:
1122911229
display: uuid
1123011230
- type: table
1123111231
must_use: true
11232-
description: Retrieves a list of attachment object keys worn by avatar in the
11233-
order they were attached, filtered by options. Returns a list containing an
11234-
error message string on failure.
11232+
description: Returns a list of object keys (UUIDs) worn by the specified avatar,
11233+
in the order they were attached, filtered by options. Returns a list containing
11234+
an error message string on failure.
1123511235
llcompat.GetBoundingBox:
1123611236
deprecated:
1123711237
message: Returns the bounding box of object (including any linked prims) relative
@@ -15980,8 +15980,7 @@ structs:
1598015980
property: override-fields
1598115981
type: function
1598215982
description: Triggered whenever the object is attached to or detached from an
15983-
avatar. Passes the UUID key of the avatar (id) if attached, or NULL_KEY if
15984-
detached.
15983+
avatar. Passes the UUID key of the avatar if attached, or NULL_KEY if detached.
1598515984
changed:
1598615985
property: override-fields
1598715986
type: function

lsl_definitions.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6804,12 +6804,12 @@ events:
68046804
- movement
68056805
attach:
68066806
arguments:
6807-
- id:
6807+
- avatar:
68086808
tooltip: UUID of the avatar the object is attached to, or NULL_KEY if
68096809
detached.
68106810
type: key
68116811
tooltip: Triggered whenever the object is attached to or detached from an
6812-
avatar. Passes the UUID key of the avatar (id) if attached, or NULL_KEY if
6812+
avatar. Passes the UUID key of the avatar if attached, or NULL_KEY if
68136813
detached.
68146814
categories:
68156815
- attachments
@@ -9140,9 +9140,9 @@ functions:
91409140
return: list
91419141
slua-return: '{uuid} | {string}'
91429142
sleep: 0.0
9143-
tooltip: Returns a list of object keys (UUIDs) corresponding to public, visible
9144-
(non-HUD) attachments worn by the specified avatar, in the order they were
9145-
attached. Returns a list with an error message string on failure.
9143+
tooltip: Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were
9144+
attached. HUDs are not included because they are neither public nor visible.
9145+
Returns a list containing an error message string on failure.
91469146
categories:
91479147
- attachments
91489148
- avatar
@@ -9161,9 +9161,8 @@ functions:
91619161
return: list
91629162
slua-return: '{uuid} | {string}'
91639163
sleep: 0.0
9164-
tooltip: Retrieves a list of attachment object keys worn by avatar in the order
9165-
they were attached, filtered by options. Returns a list containing an
9166-
error message string on failure.
9164+
tooltip: Returns a list of object keys (UUIDs) worn by the specified avatar, in the order they were
9165+
attached, filtered by options. Returns a list containing an error message string on failure.
91679166
categories:
91689167
- attachments
91699168
- avatar

0 commit comments

Comments
 (0)