Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update LSL information (Adds new AnimationOverride)

Browse Source
This commit is contained in:
Lirusaito
2013-04-16 20:16:44 -04:00
committed by Latif Khalifa
parent 733b8e75ac
commit 6c93dc1d82
7 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/lscript/lscript_byteformat.h
View File

@@ -536,6 +536,7 @@ typedef enum e_lscript_runtime_permissions
SCRIPT_PERMISSION_TRACK_CAMERA,
SCRIPT_PERMISSION_CONTROL_CAMERA,
SCRIPT_PERMISSION_TELEPORT,
SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
SCRIPT_PERMISSION_EOF
} LSCRIPTRunTimePermissions;
@@ -553,6 +554,7 @@ const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
(0x1 << 10),// SCRIPT_PERMISSION_TRACK_CAMERA
(0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA
(0x1 << 12),// SCRIPT_PERMISSION_TELEPORT
(0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS
};
// http_request string constants

8
indra/lscript/lscript_library/lscript_library.cpp
View File

@@ -532,6 +532,14 @@ void LLScriptLibrary::init()
addFunction(10.f, 0.f, dummy_func, "llUpdateCharacter", NULL, "l");
addFunction(10.f, 0.f, dummy_func, "llWanderWithin", NULL, "vvl");
// Server RC LeTigre 12.10.12.265819 new function
addFunction(0.f, 0.f, dummy_func, "llGetSimStats", "f", "i");
// Server RC LeTigre 13.03.22.272565 new function
addFunction(0.f, 0.f, dummy_func, "llSetAnimationOverride", NULL, "ss");
addFunction(0.f, 0.f, dummy_func, "llGetAnimationOverride", "s", "s");
addFunction(0.f, 0.f, dummy_func, "llResetAnimationOverride", NULL, "s");
// SL-LSL Functions to be added above this line
// ---------------------------------------------
// NOTE bytecode placement no longer applies, viewers do not compile scripts anymore (confirmed with LL, also noted by Phoenix/Firestorm team.)

3
indra/newview/app_settings/keywords.ini
View File

@@ -52,7 +52,7 @@ changed changed( integer change ):Triggered various event change the task:(tes
remote_data remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
http_response http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
http_request http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
transaction_result transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
transaction_result transaction_result(key id, integer success, string data): Triggered when currency is given to task
path_update path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used
# integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS Passed to llRequestPermissions library function to req
PERMISSION_TRACK_CAMERA Passed to llRequestPermissions library function to request permission to track agent's camera
PERMISSION_CONTROL_CAMERA Passed to llRequestPermissions library function to request permission to change agent's camera
PERMISSION_TELEPORT Passed to llRequestPermissions library function to request permission to teleport agent
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override agent's animations
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users

7
indra/newview/app_settings/lsl_functions_sl.xml
View File

@@ -1013,5 +1013,12 @@
<!-- Server RC LeTigre 12.10.12.265819 new function -->
<key>llGetSimStats</key>
<map/>
<!-- Server RC LeTigre 13.03.22.272565 new function -->
<key>llSetAnimationOverride</key>
<map/>
<key>llGetAnimationOverride</key>
<map/>
<key>llResetAnimationOverride</key>
<map/>
</map>
</llsd>

3
indra/newview/skins/apollo/keywords.ini
View File

@@ -52,7 +52,7 @@ changed changed( integer change ):Triggered various event change the task:(tes
remote_data remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
http_response http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
http_request http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
transaction_result transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
transaction_result transaction_result(key id, integer success, string data): Triggered when currency is given to task
path_update path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used
# integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS Passed to llRequestPermissions library function to req
PERMISSION_TRACK_CAMERA Passed to llRequestPermissions library function to request permission to track agent's camera
PERMISSION_CONTROL_CAMERA Passed to llRequestPermissions library function to request permission to change agent's camera
PERMISSION_TELEPORT Passed to llRequestPermissions library function to request permission to teleport agent
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override agent's animations
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users

45
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -1828,15 +1828,15 @@ Returns a list consisting of the following three values for each hit: UUID, Link
</string>
<string name="LSLTipText_llRegionSayTo">
llRegionSayTo(key target, integer channel, string msg)
Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
</string>
<string name="LSLTipText_llGetSPMaxMemory">
integer llGetSPMaxMemory()
Returns the integer of the most bytes used while llScriptProfiler was last active.
Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
</string>
<string name="LSLTipText_llGetUsedMemory">
integer llGetUsedMemory()
Returns the integer of the number of bytes of memory currently in use by the script.
Returns the current used memory for the current script. Non-mono scripts always use 16k.
</string>
<string name="LSLTipText_llScriptProfiler">
llScriptProfiler(integer flags)
@@ -1844,11 +1844,15 @@ Enables or disables script profiling options. Currently only supports PROFILE_SC
MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
</string>
<string name="LSLTipText_llSetMemoryLimit">
integer llSetMemoryLimit(integer mem)
Request ''limit'' bytes to be reserved for this script.
integer llSetMemoryLimit(integer limit)
Request limit bytes to be reserved for this script.
Returns a success/failure flag (STATUS_OK when sucessful, another of the STATUS_* flags on failure) for whether the memory limit was set.
Only relevant for Mono-compiled scripts.
</string>
<string name="LSLTipText_llGetMemoryLimit">
integer llGetMemoryLimit()
Get the maximum memory a script can use.
Returns the integer amount of memory the script can use in bytes.
</string>
<string name="LSLTipText_llSetLinkMedia">
llSetLinkMedia(integer link, integer face, list params)
@@ -1863,11 +1867,12 @@ integer llClearLinkMedia(integer link, integer face)
Clears (deletes) the media and all params from the given face on linked prim(s).
</string>
<string name="LSLTipText_llSetContentType">
llSetContentType(key request_id, integer content_type)
llSetContentType(key id, integer content_type)
Set the Internet media type of an LSL HTTP server response.
content_type may be one of CONTENT_TYPE_TEXT (default) "text/plain", or CONTENT_TYPE_HTML "text/html", only valid for embedded browsers on content owned by the person viewing. Falls back to "text/plain" otherwise.
</string>
<string name="LSLTipText_llLinkSitTarget">
llLinkSitTarget(integer link, vector offset, rotation rot );
llLinkSitTarget(integer link, vector offset, rotation rot)
Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
</string>
<string name="LSLTipText_llAvatarOnLinkSitTarget">
@@ -1876,7 +1881,8 @@ If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KE
</string>
<string name="LSLTipText_llSetLinkCamera">
llSetLinkCamera(integer link, vector eye, vector at)
Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
Sets the camera eye offset, and the offset that camera is looking at, for avatars that sit on the linked prim.
The two vector parameters are offsets relative to the object's center and expressed in local coordinates.
</string>
<string name="LSLTipText_llSetVelocity">
llSetVelocity(vector velocity, integer local)
@@ -1897,8 +1903,8 @@ llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, an
llGetMassMKS() returns the mass of the linkset in kilograms.
</string>
<string name="LSLTipText_llGenerateKey">
llGenerateKey()
Retun a unique generated key
key llGenerateKey()
Return a unique generated key
</string>
<string name="LSLTipText_llSetKeyframedMotion">
llSetKeyframedMotion(list keyframes, list options)
@@ -1924,13 +1930,6 @@ For AI Character: Navigate to destination.
llCreateCharacter(list options)
Convert linkset to AI Character which can navigate the world.
</string>
<!-- Pathfinding -->
<string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
<string name="Pathfinding_Object_Attr_None">None</string>
<string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
<string name="Pathfinding_Object_Attr_Character">Character</string>
<string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
<string name="LSLTipText_llPursue">
llPursue(key target, list options)
For AI Character: Chase after a target.
@@ -2000,6 +1999,18 @@ A region's global coordinates can be retrieved using llRequestSimulatorData(regi
float llGetSimStats(integer stat_type)
Returns the value of a particular simulator statistic.
</string>
<string name="LSLTipText_llSetAnimationOverride">
llSetAnimationOverride(string anim_state, string anim)
Set the animation (anim) that will play for the given animation state (anim_state).
</string>
<string name="LSLTipText_llGetAnimationOverride">
string llGetAnimationOverride(string anim_state)
Returns a string that is the name of the animation that is being used for the specified animation state (anim_state).
</string>
<string name="LSLTipText_llResetAnimationOverride">
llResetAnimationOverride(string anim_state)
Resets the animation override of the specified animation state (anim_state) to the corresponding default value.
</string>
<!-- GOD FUNCTIONS -->
<string name="LSLTipText_llGodLikeRezObject">
llGodLikeRezObject( key inventory, vector pos )

3
indra/newview/skins/gemini/keywords.ini
View File

@@ -52,7 +52,7 @@ changed changed( integer change ):Triggered various event change the task:(tes
remote_data remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
http_response http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
http_request http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
transaction_result transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
transaction_result transaction_result(key id, integer success, string data): Triggered when currency is given to task
path_update path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used
# integer constants
@@ -99,6 +99,7 @@ PERMISSION_CHANGE_LINKS Passed to llRequestPermissions library function to req
PERMISSION_TRACK_CAMERA Passed to llRequestPermissions library function to request permission to track agent's camera
PERMISSION_CONTROL_CAMERA Passed to llRequestPermissions library function to request permission to change agent's camera
PERMISSION_TELEPORT Passed to llRequestPermissions library function to request permission to teleport agent
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override agent's animations
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users