livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-10600: Added support for new LSL functions and constants in Server RC LeTigre/BlueSteel 13.06.06.277104

master
Ansariel 2013-06-11 23:54:18 +02:00
parent 7a334fb940
commit d495e952fb
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -548,6 +548,9 @@ void LLScriptLibrary::init()
addFunction(0.f, 0.f, dummy_func, "llJsonSetValue", "s", "sls");
addFunction(0.f, 0.f, dummy_func, "llJsonValueType", "s", "sl");
// Server RC LeTigre/BlueSteel 13.06.06.277104 new functions
addFunction(0.f, 0.f, dummy_func, "llReturnObjectsByID", "i", "l");
addFunction(0.f, 0.f, dummy_func, "llReturnObjectsByOwner", "i", "ki");
// </FS:Ansariel> According to Kelly Linden we don't need to obey the function ID order in the viewer!
// <FS:CR> Opensim/Aurora scripting functions - Please add Second Life LSL functions above this line!

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

@ -186,6 +186,10 @@ OBJECT_TEMP_ON_REZ Used with llGetObjectDetails to get an object's temporary fl
OBJECT_CHARACTER_TIME Used with llGetObjectDetails to get an object's average CPU time (in seconds) used by the object for navigation, if the object is a pathfinding character. Returns 0 for non-characters.
OBJECT_ROOT Used with llGetObjectDetails to get an object's root prim ID.
OBJECT_ATTACHED_POINT Used with llGetObjectDetails to get an object's attachment point.
OBJECT_RETURN_PARCEL Used with llReturnObjectsByOwner to return all objects on the same parcel as the script which are owned by 'owner'.
OBJECT_RETURN_PARCEL_OWNER Used with llReturnObjectsByOwner to return all objects owned by 'owner' which are over parcels owned by the owner of the script.
OBJECT_RETURN_REGION Used with llReturnObjectsByOwner to return all objects in the region owned by 'owner' - only works when the script is owned by the estate owner or an estate manager.
; End Ansariel
; some vehicle params
@ -683,6 +687,7 @@ CHARACTER_MAX_DECEL The character's maximum deceleration rate.
CHARACTER_DESIRED_TURN_SPEED The character's maximum speed while turning--note that this is only loosely enforced (i.e., a character may turn at higher speeds under certain conditions)
CHARACTER_MAX_TURN_RADIUS The character's turn radius when traveling at CHARACTER_DESIRED_TURN_SPEED.
CHARACTER_MAX_SPEED The character's maximum speed. Affects speed when avoiding dynamic obstacles and when traversing low-walkability objects in TRAVERSAL_TYPE_FAST mode.
CHARACTER_STAY_WITHIN_PARCEL Characters which have CHARACTER_STAY_WITHIN_PARCEL set to TRUE treat the parcel boundaries as one-way obstacles.
CHARACTER_ACCOUNT_FOR_SKIPPED_FRAMES Defines if a character will attempt to catch up lost time if pathfinding performance is low.
OBJECT_PATHFINDING_TYPE Used with llGetObjectDetails to get an object's pathfinding settings.
@ -717,6 +722,12 @@ JSON_TRUE Represents the constant "true" of a json value.
JSON_FALSE Represents the constant "false" of a json value.
JSON_NULL Represents the constant "null" of a json value.
JSON_APPEND Used with llJsonSetValue as a specifier to indicate appending the value to the end of the array at that level.
ERR_GENERIC Returned by llReturnObjectsByID and llReturnObjectsByOwner in case of a general error.
ERR_PARCEL_PERMISSIONS Returned by llReturnObjectsByID and llReturnObjectsByOwner in case of a parcel owner permission error.
ERR_MALFORMED_PARAMS Returned by llReturnObjectsByID and llReturnObjectsByOwner in case of malformed parameters.
ERR_RUNTIME_PERMISSIONS Returned by llReturnObjectsByID and llReturnObjectsByOwner in case of a runtime permission error.
ERR_THROTTLED Returned by llReturnObjectsByID and llReturnObjectsByOwner in case of being throttled.
; </FS:Ansariel> Manually added constants
; <FS:Ansariel> Partially commented out because they have been added manually with a custom description

8
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2197,6 +2197,14 @@ Returns a new json string that is the json given with the value indicated by spe
string llJsonValueType(string json, list specifiers)
Returns the type constant for the value in json indicated by specifiers.
</string>
<string name="LSLTipText_llReturnObjectsByID" translate="false">
integer LSLTipText_llReturnObjectsByID(list objects)
Returns a list of objects by their IDs.
</string>
<string name="LSLTipText_llReturnObjectsByOwner" translate="false">
integer llReturnObjectsByOwner(key owner, integer scope)
Returns all objects of a particular owner in the given scope.
</string>
<!-- END FS:Ansariel: LSL function tooltip help texts manually added -->