Skip to content

Commit 1f6f59c

Browse files
committed
Merge branch 'main' into rider/ruleset_adjustments
2 parents 13ee719 + 26c41ad commit 1f6f59c

20 files changed

Lines changed: 5209 additions & 2505 deletions

gen_all_definitions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ $CMD $DEFS gen_mono_library_defs ./templates/LslLibrary.cs "$outdir/templated/Ls
4545

4646
# Experimental generators
4747
$CMD $DEFS gen_enums_txt "$outdir/experimental/enums.txt"
48+
$CMD $DEFS gen_enum_users "$outdir/experimental/enum_users.json"
4849
$CMD $DEFS gen_category_functions "$outdir/experimental/category_functions.yaml"
4950
$CMD $DEFS gen_category_docs "$outdir/experimental/category_docs.yaml"

generated/builtins.txt

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void llDeleteCharacter( )
4747
key llDeleteKeyValue( string k )
4848
list llDeleteSubList( list src, integer start_index, integer end_index )
4949
string llDeleteSubString( string src, integer start_index, integer end_index )
50-
integer llDerezObject( key id, integer flag )
50+
integer llDerezObject( key id, integer flags )
5151
void llDetachFromAvatar( )
5252
list llDetectedDamage( integer number )
5353
vector llDetectedGrab( integer number )
@@ -67,12 +67,12 @@ vector llDetectedTouchST( integer index )
6767
vector llDetectedTouchUV( integer index )
6868
integer llDetectedType( integer number )
6969
vector llDetectedVel( integer number )
70-
void llDialog( key avatar, string message, list buttons, integer channel )
70+
void llDialog( key agent, string msg, list buttons, integer channel )
7171
void llDie( )
7272
string llDumpList2String( list src, string separator )
7373
integer llEdgeOfWorld( vector pos, vector dir )
7474
void llEjectFromLand( key avatar )
75-
void llEmail( string address, string subject, string message )
75+
void llEmail( string address, string subject, string msg )
7676
string llEscapeURL( string url )
7777
rotation llEuler2Rot( vector v )
7878
void llEvade( key target, list options )
@@ -92,7 +92,7 @@ list llGetAgentList( integer scope, list options )
9292
vector llGetAgentSize( key avatar )
9393
float llGetAlpha( integer face )
9494
float llGetAndResetTime( )
95-
string llGetAnimation( key id )
95+
string llGetAnimation( key avatar )
9696
list llGetAnimationList( key avatar )
9797
string llGetAnimationOverride( string anim_state )
9898
integer llGetAttached( )
@@ -127,11 +127,11 @@ float llGetHealth( key id )
127127
string llGetInventoryAcquireTime( string item )
128128
key llGetInventoryCreator( string item )
129129
string llGetInventoryDesc( string item )
130-
key llGetInventoryKey( string name )
131-
string llGetInventoryName( integer type, integer number )
130+
key llGetInventoryKey( string item )
131+
string llGetInventoryName( integer type, integer index )
132132
integer llGetInventoryNumber( integer type )
133-
integer llGetInventoryPermMask( string item, integer category )
134-
integer llGetInventoryType( string name )
133+
integer llGetInventoryPermMask( string item, integer group )
134+
integer llGetInventoryType( string item )
135135
key llGetKey( )
136136
key llGetLandOwnerAt( vector pos )
137137
key llGetLinkKey( integer link )
@@ -164,7 +164,7 @@ list llGetObjectDetails( key id, list params )
164164
key llGetObjectLinkKey( key object_id, integer link )
165165
float llGetObjectMass( key id )
166166
string llGetObjectName( )
167-
integer llGetObjectPermMask( integer category )
167+
integer llGetObjectPermMask( integer group )
168168
integer llGetObjectPrimCount( key prim )
169169
vector llGetOmega( )
170170
key llGetOwner( )
@@ -225,11 +225,11 @@ string llGetUsername( key id )
225225
vector llGetVel( )
226226
list llGetVisualParams( key agentid, list params )
227227
float llGetWallclock( )
228-
integer llGiveAgentInventory( key agent, string folder, list inventory, list options )
229-
void llGiveInventory( key destination, string inventory )
230-
void llGiveInventoryList( key target, string folder, list inventory )
228+
integer llGiveAgentInventory( key agent, string folder, list items, list options )
229+
void llGiveInventory( key target, string item )
230+
void llGiveInventoryList( key target, string folder, list items )
231231
integer llGiveMoney( key destination, integer amount )
232-
void llGodLikeRezObject( key inventory, vector pos )
232+
void llGodLikeRezObject( key id, vector pos )
233233
float llGround( vector offset )
234234
vector llGroundContour( vector offset )
235235
vector llGroundNormal( vector offset )
@@ -239,8 +239,8 @@ string llHMAC( string private_key, string msg, string algorithm )
239239
key llHTTPRequest( string url, list parameters, string body )
240240
void llHTTPResponse( key request_id, integer status, string body )
241241
integer llHash( string val )
242-
string llInsertString( string dst, integer pos, string src )
243-
void llInstantMessage( key user, string message )
242+
string llInsertString( string dst, integer index, string src )
243+
void llInstantMessage( key agent, string msg )
244244
string llIntegerToBase64( integer number )
245245
integer llIsFriend( key agent_id )
246246
integer llIsLinkGLTFMaterial( integer link, integer face )
@@ -347,8 +347,8 @@ void llReleaseControls( )
347347
void llReleaseURL( string url )
348348
void llRemoteDataReply( key channel, key message_id, string sdata, integer idata )
349349
void llRemoteDataSetRegion( )
350-
void llRemoteLoadScript( key target, string name, integer running, integer start_param )
351-
void llRemoteLoadScriptPin( key target, string name, integer pin, integer running, integer start_param )
350+
void llRemoteLoadScript( key target, string script, integer running, integer start_param )
351+
void llRemoteLoadScriptPin( key target, string script, integer pin, integer running, integer start_param )
352352
void llRemoveFromLandBanList( key avatar )
353353
void llRemoveFromLandPassList( key avatar )
354354
void llRemoveInventory( string item )
@@ -359,7 +359,7 @@ string llReplaceSubString( string src, string pattern, string replacement_patter
359359
key llRequestAgentData( key id, integer data )
360360
key llRequestDisplayName( key id )
361361
void llRequestExperiencePermissions( key agent, string name )
362-
key llRequestInventoryData( string name )
362+
key llRequestInventoryData( string item )
363363
void llRequestPermissions( key agent, integer permissions )
364364
key llRequestSecureURL( )
365365
key llRequestSimulatorData( string region, integer data )
@@ -369,14 +369,14 @@ key llRequestUsername( key id )
369369
void llResetAnimationOverride( string anim_state )
370370
void llResetLandBanList( )
371371
void llResetLandPassList( )
372-
void llResetOtherScript( string name )
372+
void llResetOtherScript( string script )
373373
void llResetScript( )
374374
void llResetTime( )
375375
integer llReturnObjectsByID( list objects )
376376
integer llReturnObjectsByOwner( key owner, integer scope )
377-
void llRezAtRoot( string inventory, vector position, vector velocity, rotation rot, integer param )
378-
void llRezObject( string inventory, vector pos, vector vel, rotation rot, integer param )
379-
key llRezObjectWithParams( string inventory, list params )
377+
void llRezAtRoot( string item, vector pos, vector vel, rotation rot, integer start_param )
378+
void llRezObject( string item, vector pos, vector vel, rotation rot, integer start_param )
379+
key llRezObjectWithParams( string item, list options )
380380
float llRot2Angle( rotation rot )
381381
vector llRot2Axis( rotation rot )
382382
vector llRot2Euler( rotation quat )
@@ -420,7 +420,7 @@ void llSetForce( vector force, integer is_local )
420420
void llSetForceAndTorque( vector force, vector torque, integer is_local )
421421
integer llSetGroundTexture( list changes )
422422
void llSetHoverHeight( float height, integer water, float tau )
423-
void llSetInventoryPermMask( string item, integer category, integer value )
423+
void llSetInventoryPermMask( string item, integer group, integer flags )
424424
void llSetKeyframedMotion( list keyframes, list options )
425425
void llSetLinkAlpha( integer link, float alpha, integer face )
426426
void llSetLinkCamera( integer link, vector eye, vector at )
@@ -437,7 +437,7 @@ void llSetLocalRot( rotation rot )
437437
integer llSetMemoryLimit( integer limit )
438438
void llSetObjectDesc( string description )
439439
void llSetObjectName( string name )
440-
void llSetObjectPermMask( integer mask, integer value )
440+
void llSetObjectPermMask( integer group, integer flags )
441441
integer llSetParcelForSale( integer ForSale, list Options )
442442
void llSetParcelMusicURL( string url )
443443
void llSetPayPrice( integer price, list quick_pay_buttons )
@@ -451,7 +451,7 @@ void llSetRemoteScriptAccessPin( integer pin )
451451
void llSetRenderMaterial( string material, integer face )
452452
void llSetRot( rotation rot )
453453
void llSetScale( vector size )
454-
void llSetScriptState( string name, integer running )
454+
void llSetScriptState( string script, integer running )
455455
void llSetSitText( string text )
456456
void llSetSoundQueueing( integer queue )
457457
void llSetSoundRadius( float radius )
@@ -496,15 +496,15 @@ float llTan( float theta )
496496
integer llTarget( vector position, float range )
497497
void llTargetOmega( vector axis, float spinrate, float gain )
498498
void llTargetRemove( integer handle )
499-
void llTargetedEmail( integer target, string subject, string message )
499+
void llTargetedEmail( integer target, string subject, string msg )
500500
void llTeleportAgent( key agent, string landmark, vector position, vector look_at )
501501
void llTeleportAgentGlobalCoords( key agent, vector global_coordinates, vector region_coordinates, vector look_at )
502502
void llTeleportAgentHome( key avatar )
503-
void llTextBox( key avatar, string message, integer channel )
503+
void llTextBox( key agent, string msg, integer channel )
504504
string llToLower( string src )
505505
string llToUpper( string src )
506506
key llTransferLindenDollars( key destination, integer amount )
507-
integer llTransferOwnership( key agent_id, integer flags, list options )
507+
integer llTransferOwnership( key agent, integer flags, list options )
508508
void llTriggerSound( string sound, float volume )
509509
void llTriggerSoundLimited( string sound, float volume, vector top_north_east, vector bottom_south_west )
510510
void llUnSit( key id )
@@ -1555,14 +1555,14 @@ 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 )
1559-
event changed( integer change )
1558+
event attach( key avatar )
1559+
event changed( integer changes )
15601560
event collision( integer num_detected )
15611561
event collision_end( integer num_detected )
15621562
event collision_start( integer num_detected )
15631563
event control( key id, integer level, integer edge )
15641564
event dataserver( key queryid, string data )
1565-
event email( string time, string address, string subject, string message, integer num_left )
1565+
event email( string time, string address, string subject, string msg, integer num_left )
15661566
event experience_permissions( key agent_id )
15671567
event experience_permissions_denied( key agent_id, integer reason )
15681568
event final_damage( integer num_detected )
@@ -1574,7 +1574,7 @@ event land_collision_end( vector pos )
15741574
event land_collision_start( vector pos )
15751575
event link_message( integer sender_num, integer num, string str, key id )
15761576
event linkset_data( integer action, string name, string value )
1577-
event listen( integer channel, string name, key id, string message )
1577+
event listen( integer channel, string name, key id, string msg )
15781578
event money( key id, integer amount )
15791579
event moving_end( )
15801580
event moving_start( )

0 commit comments

Comments
 (0)