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

Update lsl stuffs (Adds support for all the new stuff we'd fallen behind on)

Browse Source
This commit is contained in:
Lirusaito
2013-07-17 12:59:01 -04:00
parent a1d9473fde
commit 2b7c70d765
9 changed files with 252 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
indra/lscript/lscript_byteformat.h
View File

@@ -2,31 +2,25 @@
* @file lscript_byteformat.h
* @brief Shared code between compiler and assembler and LSL
*
* $LicenseInfo:firstyear=2002&license=viewergpl$
*
* Copyright (c) 2002-2009, Linden Research, Inc.
*
* $LicenseInfo:firstyear=2002&license=viewerlgpl$
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -536,7 +530,10 @@ typedef enum e_lscript_runtime_permissions
SCRIPT_PERMISSION_TRACK_CAMERA,
SCRIPT_PERMISSION_CONTROL_CAMERA,
SCRIPT_PERMISSION_TELEPORT,
SCRIPT_PERMISSION_EXPERIENCE,
SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT,
SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
SCRIPT_PERMISSION_RETURN_OBJECTS,
SCRIPT_PERMISSION_EOF
} LSCRIPTRunTimePermissions;
@@ -554,7 +551,10 @@ 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
(0x1 << 13),// SCRIPT_PERMISSION_EXPERIENCE,
(0x1 << 14),// SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT,
(0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
(0x1 << 16),// SCRIPT_PERMISSION_RETURN_OBJECTS,
};
// http_request string constants

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

@@ -99,7 +99,9 @@ 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
SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT Passed to llRequestPermissions library function to request permission to silently modify estate access lists
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override animations on agent
PERMISSION_RETURN_OBJECTS Passed to llRequestPermissions library function to request permission to return objects
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users
@@ -132,6 +134,11 @@ PSYS_PART_END_ALPHA
PSYS_PART_END_SCALE
PSYS_PART_MAX_AGE
PSYS_PART_BLEND_FUNC_SOURCE
PSYS_PART_BLEND_FUNC_DEST
PSYS_PART_START_GLOW
PSYS_PART_END_GLOW
PSYS_PART_BOUNCE_MASK
PSYS_PART_WIND_MASK
PSYS_PART_INTERP_COLOR_MASK
@@ -141,6 +148,16 @@ PSYS_PART_FOLLOW_VELOCITY_MASK
PSYS_PART_TARGET_POS_MASK
PSYS_PART_EMISSIVE_MASK
PSYS_PART_TARGET_LINEAR_MASK
PSYS_PART_RIBBON_MASK
PSYS_PART_BF_ONE
PSYS_PART_BF_ZERO
PSYS_PART_BF_DEST_COLOR
PSYS_PART_BF_SOURCE_COLOR
PSYS_PART_BF_ONE_MINUS_DEST_COLOR
PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR
PSYS_PART_BF_SOURCE_ALPHA
PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA
PSYS_SRC_PATTERN
PSYS_SRC_INNERANGLE Deprecated -- Use PSYS_SRC_ANGLE_BEGIN
@@ -182,6 +199,13 @@ OBJECT_SERVER_COST Used with llGetObjectDetails to get the server cost.
OBJECT_STREAMING_COST Used with llGetObjectDetails to get the streaming (download) cost.
OBJECT_PHYSICS_COST Used with llGetObjectDetails to get the physics cost.
OBJECT_PATHFINDING_TYPE Used with llGetObjectDetails to get an object's pathfinding settings.
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.
OPT_UNKNOWN Returned object pathfinding type by llGetObjectDetails for attachments, Linden trees and grass.
OPT_LEGACY_LINKSET Returned object pathfinding type by llGetObjectDetails for movable obstacles, movable phantoms, physical, and volumedetect objects.
OPT_AVATAR Returned object pathfinding type by llGetObjectDetails for avatars.
@@ -675,6 +699,7 @@ REQUIRE_LINE_OF_SIGHT Used with llPursue(). Define whether the character needs
PURSUIT_FUZZ_FACTOR Used with llPursue(). Selects a random destination near the PURSUIT_OFFSET. The valid fuzz factor range is from 0 to 1, where 1 is most random. This option requires a nonzero PURSUIT_OFFSET.
PURSUIT_INTERCEPT Used with llPursue(). Define whether the character attempts to predict the target's future location.
PURSUIT_GOAL_TOLERANCE Used with llPursue(). Defines approximately how close the character must be to the current goal to consider itself to be at the desired position. The valid range is from 0.25 to 10m.
FORCE_DIRECT_PATH Used with llNavigateTo(). Makes character navigate in a straight line toward pos. May be set to TRUE or FALSE.
VERTICAL Constant to indicate that the orientation of the capsule for a Pathfinding character is vertical.
HORIZONTAL Constant to indicate that the orientation of the capsule for a Pathfinding character is horizontal.
AVOID_CHARACTERS TODO: add documentation
@@ -715,10 +740,37 @@ CHARACTER_TURN_SPEED_MULTIPLIER TODO: add documentation
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.
PATROL_PAUSE_AT_WAYPOINTS Used with llPatrolPoints(). Defines if characters slow down and momentarily pause at each waypoint.
WANDER_PAUSE_AT_WAYPOINTS Used with llWanderWithin(). Defines if characters should pause after reaching each wander waypoint.
CONTENT_TYPE_TEXT text/plain
CONTENT_TYPE_HTML text/html
CONTENT_TYPE_XML application/xml
CONTENT_TYPE_XHTML application/xhtml+xml
CONTENT_TYPE_ATOM application/atom+xml
CONTENT_TYPE_JSON application/json
CONTENT_TYPE_LLSD application/llsd+xml
CONTENT_TYPE_FORM application/x-www-form-urlencoded
CONTENT_TYPE_RSS application/rss+xml
JSON_INVALID Returned by llJsonGetValue and llJsonValueType if the specifiers to do specify a valid in the json value.
JSON_OBJECT Represents a json datatype represented in LSL as a strided list of name/value pairs
JSON_ARRAY Represents a json datatype mappable to the LSL datatype "list"
JSON_NUMBER Represents a json datatype mappable to the LSL datatypes "integer" and "float"
JSON_STRING Represents a json datatype mappable to the LSL datatype "string"
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.
# --- OpenSim and Aurora-Sim constants Below ---
# OpenSim Constants (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\LSL_Constants.cs)
# Constants for cmWindlight (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\CM_Constants.cs)

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

@@ -1020,5 +1020,24 @@
<map/>
<key>llResetAnimationOverride</key>
<map/>
<!-- 13.05.20.276191 new function -->
<key>llJson2List</key>
<map/>
<key>llList2Json</key>
<map/>
<key>llJsonGetValue</key>
<map/>
<key>llJsonSetValue</key>
<map/>
<key>llJsonValueType</key>
<map/>
<!-- 13.06.18.277494 new function -->
<key>llReturnObjectsByID</key>
<map/>
<key>llReturnObjectsByOwner</key>
<map/>
<!-- 13.06.21.277682 new function -->
<key>llXorBase64</key>
<map/>
</map>
</llsd>
</llsd>

17
indra/newview/llviewermessage.cpp
View File

@@ -187,7 +187,10 @@ const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
"TrackYourCamera",
"ControlYourCamera",
"TeleportYourAgent",
"OverrideAnimations"
"JoinAnExperience",
"SilentlyManageEstateAccess",
"OverrideYourAnimations",
"ScriptReturnObjects"
};
const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
@@ -204,7 +207,10 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
FALSE, // TrackYourCamera,
FALSE, // ControlYourCamera
FALSE, // TeleportYourAgent
FALSE // OverrideAnimations
FALSE, // JoinAnExperience
FALSE, // SilentlyManageEstateAccess
FALSE, // OverrideYourAnimations
FALSE, // ScriptReturnObjects
};
bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
@@ -259,11 +265,6 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
static LLNotificationFunctorRegistration friendship_offer_callback_reg("OfferFriendship", friendship_offer_callback);
static LLNotificationFunctorRegistration friendship_offer_callback_reg_nm("OfferFriendshipNoMessage", friendship_offer_callback);
//const char BUSY_AUTO_RESPONSE[] = "The Resident you messaged is in 'busy mode' which means they have "
// "requested not to be disturbed. Your message will still be shown in their IM "
// "panel for later viewing.";
//
// Functions
//
@@ -6674,7 +6675,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
// located in [REGIONNAME] at [REGIONPOS],
// has been <granted|denied> permission to: [PERMISSIONS]."
LLUIString notice(LLFloaterChat::getInstance()->getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
LLUIString notice(LLTrans::getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
// always include the object name and owner name
notice.setArg("[OBJECTNAME]", notification["payload"]["object_name"].asString());

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

@@ -99,7 +99,9 @@ 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
SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT Passed to llRequestPermissions library function to request permission to silently modify estate access lists
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override animations on agent
PERMISSION_RETURN_OBJECTS Passed to llRequestPermissions library function to request permission to return objects
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users
@@ -132,6 +134,11 @@ PSYS_PART_END_ALPHA
PSYS_PART_END_SCALE
PSYS_PART_MAX_AGE
PSYS_PART_BLEND_FUNC_SOURCE
PSYS_PART_BLEND_FUNC_DEST
PSYS_PART_START_GLOW
PSYS_PART_END_GLOW
PSYS_PART_BOUNCE_MASK
PSYS_PART_WIND_MASK
PSYS_PART_INTERP_COLOR_MASK
@@ -141,6 +148,16 @@ PSYS_PART_FOLLOW_VELOCITY_MASK
PSYS_PART_TARGET_POS_MASK
PSYS_PART_EMISSIVE_MASK
PSYS_PART_TARGET_LINEAR_MASK
PSYS_PART_RIBBON_MASK
PSYS_PART_BF_ONE
PSYS_PART_BF_ZERO
PSYS_PART_BF_DEST_COLOR
PSYS_PART_BF_SOURCE_COLOR
PSYS_PART_BF_ONE_MINUS_DEST_COLOR
PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR
PSYS_PART_BF_SOURCE_ALPHA
PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA
PSYS_SRC_PATTERN
PSYS_SRC_INNERANGLE Deprecated -- Use PSYS_SRC_ANGLE_BEGIN
@@ -182,6 +199,13 @@ OBJECT_SERVER_COST Used with llGetObjectDetails to get the server cost.
OBJECT_STREAMING_COST Used with llGetObjectDetails to get the streaming (download) cost.
OBJECT_PHYSICS_COST Used with llGetObjectDetails to get the physics cost.
OBJECT_PATHFINDING_TYPE Used with llGetObjectDetails to get an object's pathfinding settings.
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.
OPT_UNKNOWN Returned object pathfinding type by llGetObjectDetails for attachments, Linden trees and grass.
OPT_LEGACY_LINKSET Returned object pathfinding type by llGetObjectDetails for movable obstacles, movable phantoms, physical, and volumedetect objects.
OPT_AVATAR Returned object pathfinding type by llGetObjectDetails for avatars.
@@ -675,6 +699,7 @@ REQUIRE_LINE_OF_SIGHT Used with llPursue(). Define whether the character needs
PURSUIT_FUZZ_FACTOR Used with llPursue(). Selects a random destination near the PURSUIT_OFFSET. The valid fuzz factor range is from 0 to 1, where 1 is most random. This option requires a nonzero PURSUIT_OFFSET.
PURSUIT_INTERCEPT Used with llPursue(). Define whether the character attempts to predict the target's future location.
PURSUIT_GOAL_TOLERANCE Used with llPursue(). Defines approximately how close the character must be to the current goal to consider itself to be at the desired position. The valid range is from 0.25 to 10m.
FORCE_DIRECT_PATH Used with llNavigateTo(). Makes character navigate in a straight line toward pos. May be set to TRUE or FALSE.
VERTICAL Constant to indicate that the orientation of the capsule for a Pathfinding character is vertical.
HORIZONTAL Constant to indicate that the orientation of the capsule for a Pathfinding character is horizontal.
AVOID_CHARACTERS TODO: add documentation
@@ -715,10 +740,37 @@ CHARACTER_TURN_SPEED_MULTIPLIER TODO: add documentation
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.
PATROL_PAUSE_AT_WAYPOINTS Used with llPatrolPoints(). Defines if characters slow down and momentarily pause at each waypoint.
WANDER_PAUSE_AT_WAYPOINTS Used with llWanderWithin(). Defines if characters should pause after reaching each wander waypoint.
CONTENT_TYPE_TEXT text/plain
CONTENT_TYPE_HTML text/html
CONTENT_TYPE_XML application/xml
CONTENT_TYPE_XHTML application/xhtml+xml
CONTENT_TYPE_ATOM application/atom+xml
CONTENT_TYPE_JSON application/json
CONTENT_TYPE_LLSD application/llsd+xml
CONTENT_TYPE_FORM application/x-www-form-urlencoded
CONTENT_TYPE_RSS application/rss+xml
JSON_INVALID Returned by llJsonGetValue and llJsonValueType if the specifiers to do specify a valid in the json value.
JSON_OBJECT Represents a json datatype represented in LSL as a strided list of name/value pairs
JSON_ARRAY Represents a json datatype mappable to the LSL datatype "list"
JSON_NUMBER Represents a json datatype mappable to the LSL datatypes "integer" and "float"
JSON_STRING Represents a json datatype mappable to the LSL datatype "string"
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.
# --- OpenSim and Aurora-Sim constants Below ---
# OpenSim Constants (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\LSL_Constants.cs)
# Constants for cmWindlight (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\CM_Constants.cs)
@@ -885,7 +937,7 @@ return Leave current function or event handler
# Comment
[one_sided_delimiter .457, .441, .367]
// Comment:Non-functional commentary or disabled code
[two_sided_delimiter_esc .457, .441, .367]
[two_sided_delimiter .457, .441, .367]
/* */ Comment:Non-functional commentary or disabled code
# String literals

2
indra/newview/skins/default/xui/de/strings.xml
View File

@@ -331,7 +331,7 @@
<string name="TrackYourCamera">Kameraverfolgung aktivieren</string>
<string name="ControlYourCamera">Kamerasteuerung übernehmen</string>
<string name="TeleportYourAgent">Avatar teleportieren</string>
<string name="OverrideAnimations">Überschreibe die Standard-Animationen</string>
<string name="OverrideYourAnimations">Überschreibe die Standard-Animationen</string>
<!-- Sim Access labels -->
<string name="SIM_ACCESS_PG">PG</string>

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

@@ -335,7 +335,12 @@
<string name="TrackYourCamera">Track your camera</string>
<string name="ControlYourCamera">Control your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="OverrideAnimations">Override your default animations</string>
<string name="JoinAnExperience">Join an experience</string> <!-- not used -->
<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
<string name="OverrideYourAnimations">Replace your default animations</string>
<string name="ScriptReturnObjects">Return objects on your behalf</string>
<string name="UnknownScriptPermission">(unknown)!</string>
<!-- Sim Access labels -->
<string name="SIM_ACCESS_PG">PG</string>
@@ -2048,6 +2053,38 @@ Returns a string that is the name of the animation that is being used for the sp
llResetAnimationOverride(string anim_state)
Resets the animation override of the specified animation state (anim_state) to the corresponding default value.
</string>
<string name="LSLTipText_llJson2List" translate="false">
list llJson2List(string json)
Converts the top level of the json string to a list.
</string>
<string name="LSLTipText_llList2Json" translate="false">
string llList2Json(string type, list values)
Converts either a strided list of key:value pairs to a JSON_OBJECT or a list of values to a JSON_ARRAY
</string>
<string name="LSLTipText_llJsonGetValue" translate="false">
string llJsonGetValue(string json, list specifiers)
Gets the value indicated by specifiers from the json string.
</string>
<string name="LSLTipText_llJsonSetValue" translate="false">
string llJsonSetValue(string json, list specifiers, string value)
Returns a new json string that is the json given with the value indicated by specifiers set to value.
</string>
<string name="LSLTipText_llJsonValueType" translate="false">
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 llReturnObjectsByID(list objects)
Returns a list of objects by their IDs or an ERR_* flag.
</string>
<string name="LSLTipText_llReturnObjectsByOwner" translate="false">
integer llReturnObjectsByOwner(key owner, integer scope)
Returns all objects of a particular owner in the given scope or an ERR_* flag.
</string>
<string name="LSLTipText_llXorBase64" translate="false">
string llXorBase64(string str1, string str2)
Returns a string that is a Base64 XOR of Base64-formatted input strings.
</string>
<!-- GOD FUNCTIONS -->
<string name="LSLTipText_llGodLikeRezObject">
llGodLikeRezObject( key inventory, vector pos )

2
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -307,7 +307,7 @@
<string name="TrackYourCamera">Seguir tu cámara</string>
<string name="ControlYourCamera">Controlar tu cámara</string>
<string name="TeleportYourAgent">Teleportarte</string>
<string name="OverrideAnimations">Reemplazando tus animaciones predeterminadas</string>
<string name="OverrideYourAnimations">Reemplazando tus animaciones predeterminadas</string>
<!-- Sim Access labels -->
<string name="SIM_ACCESS_PG">PG</string>

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

@@ -99,7 +99,9 @@ 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
SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT Passed to llRequestPermissions library function to request permission to silently modify estate access lists
PERMISSION_OVERRIDE_ANIMATIONS Passed to llRequestPermissions library function to request permission to override animations on agent
PERMISSION_RETURN_OBJECTS Passed to llRequestPermissions library function to request permission to return objects
DEBUG_CHANNEL Chat channel reserved for debug and error messages from scripts
PUBLIC_CHANNEL Chat channel that broadcasts to all nearby users
@@ -132,6 +134,11 @@ PSYS_PART_END_ALPHA
PSYS_PART_END_SCALE
PSYS_PART_MAX_AGE
PSYS_PART_BLEND_FUNC_SOURCE
PSYS_PART_BLEND_FUNC_DEST
PSYS_PART_START_GLOW
PSYS_PART_END_GLOW
PSYS_PART_BOUNCE_MASK
PSYS_PART_WIND_MASK
PSYS_PART_INTERP_COLOR_MASK
@@ -141,6 +148,16 @@ PSYS_PART_FOLLOW_VELOCITY_MASK
PSYS_PART_TARGET_POS_MASK
PSYS_PART_EMISSIVE_MASK
PSYS_PART_TARGET_LINEAR_MASK
PSYS_PART_RIBBON_MASK
PSYS_PART_BF_ONE
PSYS_PART_BF_ZERO
PSYS_PART_BF_DEST_COLOR
PSYS_PART_BF_SOURCE_COLOR
PSYS_PART_BF_ONE_MINUS_DEST_COLOR
PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR
PSYS_PART_BF_SOURCE_ALPHA
PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA
PSYS_SRC_PATTERN
PSYS_SRC_INNERANGLE Deprecated -- Use PSYS_SRC_ANGLE_BEGIN
@@ -182,6 +199,13 @@ OBJECT_SERVER_COST Used with llGetObjectDetails to get the server cost.
OBJECT_STREAMING_COST Used with llGetObjectDetails to get the streaming (download) cost.
OBJECT_PHYSICS_COST Used with llGetObjectDetails to get the physics cost.
OBJECT_PATHFINDING_TYPE Used with llGetObjectDetails to get an object's pathfinding settings.
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.
OPT_UNKNOWN Returned object pathfinding type by llGetObjectDetails for attachments, Linden trees and grass.
OPT_LEGACY_LINKSET Returned object pathfinding type by llGetObjectDetails for movable obstacles, movable phantoms, physical, and volumedetect objects.
OPT_AVATAR Returned object pathfinding type by llGetObjectDetails for avatars.
@@ -675,6 +699,7 @@ REQUIRE_LINE_OF_SIGHT Used with llPursue(). Define whether the character needs
PURSUIT_FUZZ_FACTOR Used with llPursue(). Selects a random destination near the PURSUIT_OFFSET. The valid fuzz factor range is from 0 to 1, where 1 is most random. This option requires a nonzero PURSUIT_OFFSET.
PURSUIT_INTERCEPT Used with llPursue(). Define whether the character attempts to predict the target's future location.
PURSUIT_GOAL_TOLERANCE Used with llPursue(). Defines approximately how close the character must be to the current goal to consider itself to be at the desired position. The valid range is from 0.25 to 10m.
FORCE_DIRECT_PATH Used with llNavigateTo(). Makes character navigate in a straight line toward pos. May be set to TRUE or FALSE.
VERTICAL Constant to indicate that the orientation of the capsule for a Pathfinding character is vertical.
HORIZONTAL Constant to indicate that the orientation of the capsule for a Pathfinding character is horizontal.
AVOID_CHARACTERS TODO: add documentation
@@ -715,10 +740,37 @@ CHARACTER_TURN_SPEED_MULTIPLIER TODO: add documentation
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.
PATROL_PAUSE_AT_WAYPOINTS Used with llPatrolPoints(). Defines if characters slow down and momentarily pause at each waypoint.
WANDER_PAUSE_AT_WAYPOINTS Used with llWanderWithin(). Defines if characters should pause after reaching each wander waypoint.
CONTENT_TYPE_TEXT text/plain
CONTENT_TYPE_HTML text/html
CONTENT_TYPE_XML application/xml
CONTENT_TYPE_XHTML application/xhtml+xml
CONTENT_TYPE_ATOM application/atom+xml
CONTENT_TYPE_JSON application/json
CONTENT_TYPE_LLSD application/llsd+xml
CONTENT_TYPE_FORM application/x-www-form-urlencoded
CONTENT_TYPE_RSS application/rss+xml
JSON_INVALID Returned by llJsonGetValue and llJsonValueType if the specifiers to do specify a valid in the json value.
JSON_OBJECT Represents a json datatype represented in LSL as a strided list of name/value pairs
JSON_ARRAY Represents a json datatype mappable to the LSL datatype "list"
JSON_NUMBER Represents a json datatype mappable to the LSL datatypes "integer" and "float"
JSON_STRING Represents a json datatype mappable to the LSL datatype "string"
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.
# --- OpenSim and Aurora-Sim constants Below ---
# OpenSim Constants (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\LSL_Constants.cs)
# Constants for cmWindlight (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\CM_Constants.cs)
@@ -885,7 +937,7 @@ return Leave current function or event handler
# Comment
[one_sided_delimiter .457, .441, .367]
// Comment:Non-functional commentary or disabled code
[two_sided_delimiter_esc .457, .441, .367]
[two_sided_delimiter .457, .441, .367]
/* */ Comment:Non-functional commentary or disabled code
# String literals