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

Complete Issue 545: OSSL Updates

Browse Source 
Updates keywords.ini, lsl_functions_os.xml, and en-us/strings.xml
Thanks WhiteStar, ThiteStar.
This commit is contained in:
Inusaito Sayori
2012-12-22 12:25:46 -05:00
parent 0b9d8c7b47
commit 6f2e192947
4 changed files with 252 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -701,7 +701,23 @@ CHARACTER_MAX_TURN_RADIUS TODO: add documentation
# --- 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)
CHANGED_ANIMATION OpenSim change event animation change detection.
CHANGED_ANIMATION OpenSim change event animation change detection.
CAMERA_FOCUS_OFFSET_X OpenSim enhancement for llSetCameraParams(), adjusts the camera focus x position relative to the target. (float)
CAMERA_FOCUS_OFFSET_Y OpenSim enhancement for llSetCameraParams(), adjusts the camera focus y position relative to the target. (float)
CAMERA_FOCUS_OFFSET_Z OpenSim enhancement for llSetCameraParams(), adjusts the camera focus z position relative to the target. (float)
CAMERA_POSITION_X OpenSim enhancement for llSetCameraParams(), sets camera x position in region coordinates. (float)
CAMERA_POSITION_Y OpenSim enhancement for llSetCameraParams(), sets camera y position in region coordinates. (float)
CAMERA_POSITION_Z OpenSim enhancement for llSetCameraParams(), sets camera z position in region coordinates. (float)
CAMERA_FOCUS_X OpenSim enhancement for llSetCameraParams(), sets camera x focus (target position) in region coordinates. (float)
CAMERA_FOCUS_Y OpenSim enhancement for llSetCameraParams(), sets camera y focus (target position) in region coordinates. (float)
CAMERA_FOCUS_Z OpenSim enhancement for llSetCameraParams(), sets camera z focus (target position) in region coordinates. (float)
OS_LISTEN_REGEX_NAME Value 0x1, process name parameter as regex
OS_LISTEN_REGEX_MESSAGE Value 0x2, process name parameter as regex
OS_ATTACH_MSG_ALL Used with osMessageAttachements
OS_ATTACH_MSG_INVERT_POINTS Used with osMessageAttachements
OS_ATTACH_MSG_OBJECT_CREATOR Used with osMessageAttachements
OS_ATTACH_MSG_SCRIPT_CREATOR Used with osMessageAttachements
PARCEL_DETAILS_CLAIMDATE Used with osSetParcelDetails
# osGetRegionStats
STATS_TIME_DILATION returned value from osGetRegionStats(), 1st of 21 items in returned list.
STATS_SIM_FPS returned value from osGetRegionStats(), 2nd of 21 items in returned list.
@@ -725,14 +741,15 @@ STATS_PENDING_UPLOADS returned value from osGetRegionStats(), 19th of 21 items
STATS_ACTIVE_SCRIPTS returned value from osGetRegionStats(), 20th of 21 items in returned list.
STATS_SCRIPT_LPS returned value from osGetRegionStats(), 21st of 21 items in returned list.
# OpenSim NPC
OS_NPC_FLY used by osNPC.
OS_NPC_NO_FLY used by osNPC.
OS_NPC_LAND_AT_TARGET used by osNPC.
OS_NPC_SIT_NOW used by osNPC.
OS_NPC_CREATOR_OWNED used by osNPC.
OS_NPC_NOT_OWNED used by osNPC.
OS_NPC_SENSE_AS_AGENT used by osNPC.
OS_NPC_RUNNING used by osNPC.
OS_NPC used by osNPC. Value 0x01000000
OS_NPC_FLY used by osNPC. Value 0
OS_NPC_NO_FLY used by osNPC. Value 1
OS_NPC_LAND_AT_TARGET used by osNPC. Value 2
OS_NPC_SIT_NOW used by osNPC. Value 0
OS_NPC_CREATOR_OWNED used by osNPC. Value 0x1
OS_NPC_NOT_OWNED used by osNPC. Value 0x2
OS_NPC_SENSE_AS_AGENT used by osNPC. Value 0x4
OS_NPC_RUNNING used by osNPC. Value 4
# Windlight/Lightshare
WL_WATER_COLOR Windlight Water Colour
WL_WATER_FOG_DENSITY_EXPONENT Windlight Water Fog Density Exponent
@@ -771,7 +788,15 @@ WL_CLOUD_SCROLL_Y Windlight Cloud Scroll Y
WL_CLOUD_SCROLL_Y_LOCK Windlight Cloud Scroll Y Lock
WL_CLOUD_SCROLL_X_LOCK Windlight Cloud Scroll X Lock
WL_DRAW_CLASSIC_CLOUDS Windlight Draw Classic Clouds
# Aurora-Sim Constants (\Aurora\AuroraDotNetEngine\APIs\AA_Constants.cs) -->
# WL Constants added unique to Aurora-Sim
WL_OK Value -1
WL_ERROR Value -2
WL_ERROR_NO_SCENE_SET Value -3
WL_ERROR_SCENE_MUST_BE_STATIC Value -4
WL_ERROR_SCENE_MUST_NOT_BE_STATIC Value -5
WL_ERROR_BAD_SETTING Value -6
WL_ERROR_NO_PRESET_FOUND Value -7
# Aurora-Sim Constants (\Aurora\AuroraDotNetEngine\APIs\AA_Constants.cs)
ENABLE_GRAVITY enable_gravity.
GRAVITY_FORCE_X gravity_force_x.
GRAVITY_FORCE_Y gravity_force_y.

60
indra/newview/app_settings/lsl_functions_os.xml
View File

@@ -247,6 +247,46 @@
<map/>
<key>osNpcWhisper</key>
<map/>
<key>osForceAttachToAvatar</key>
<map/>
<key>osForceAttachToAvatarFromInventory</key>
<map/>
<key>osForceAttachToOtherAvatarFromInventory</key>
<map/>
<key>osNpcTouch</key>
<map/>
<key>osNpcTouch</key>
<map/>
<key>osIsUUID</key>
<map/>
<key>osMin</key>
<map/>
<key>osMax</key>
<map/>
<key>osMax</key>
<map/>
<key>osGetRezzingObject</key>
<map/>
<key>osGetHealth</key>
<map/>
<key>osSetContentType</key>
<map/>
<key>osGetNumberOfAttachments</key>
<map/>
<key>osMessageAttachments</key>
<map/>
<key>osDropAttachments</key>
<map/>
<key>osDropAttachmentsAt</key>
<map/>
<key>osForceDropAttachments</key>
<map/>
<key>osForceDropAttachmentsAt</key>
<map/>
<key>osListenRegex</key>
<map/>
<key>osRegexIsMatch</key>
<map/>
<!-- OSSL Functions Aurora-Sim Unique -->
<key>osReturnObject</key>
@@ -334,6 +374,24 @@
<map/>
<key>aaGetIsInfiniteRegion</key>
<map/>
<key>aaSetCharacterStat</key>
<map/>
<key>aaAllRegionInstanceSay</key>
<map/>
<key>aaWindlightGetDayCycle</key>
<map/>
<key>aaWindlightAddDayCycleFrame</key>
<map/>
<key>aaWindlightRemoveDayCycleFrame</key>
<map/>
<key>aaWindlightSetScene</key>
<map/>
<key>aaWindlightGetScene</key>
<map/>
<key>aaWindlightGetSceneIsStatic</key>
<map/>
<key>aaWindlightGetSceneDayCycleKeyFrameCount</key>
<map/>
<!-- botFunctions Aurora-Sim ONLY -->
<key>botGetWaitingTime</key>
<map/>
@@ -370,4 +428,4 @@
<key>botRemoveBotsWithTag</key>
<map/>
</map>
</llsd>
</llsd>

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

@@ -2518,6 +2518,84 @@ Returns True / False if user identified by agentID is successfully added to grou
integer osEjectFromGroup(key agentId)
Returns True / False if user identified by agentID is successfully removed from group. (Object containing script must be attached to a group)
</string>
<string name="LSLTipText_osForceAttachToAvatar">
osForceAttachToAvatar(integer attachPoint)
Attach the object containing this script to the avatar that owns it without asking for PERMISSION_ATTACH to the attachPoint. For example, ATTACH_CHEST.
</string>
<string name="LSLTipText_osForceAttachToAvatarFromInventory">
osForceAttachToAvatarFromInventory(string itemName, integer attachPoint)
Attach the inventory item in the object containing this script to the avatar that owns it without checking for PERMISSION_ATTACH
If itemName is not found in the inventory then a warning is sent to the owner. An example of attachPoint is ATTACH_CHEST.
</string>
<string name="LSLTipText_osForceAttachToOtherAvatarFromInventory">
osForceAttachToOtherAvatarFromInventory(string rawAvatarId, string itemName, integer attachPoint)
Attach an inventory item in the object containing this script to any avatar in the region without asking for PERMISSION_ATTACH.
rawAvatarId = The UUID of the avatar to which to attach. itemName = The name of the item. attachPoint = The attachment point. Example, ATTACH_CHEST.
</string>
<string name="LSLTipText_osNpcTouch">
osNpcTouch(key npcKey, key object_key, integer link_num)
Allows the NPC, npcKey, to touch the specified object, object_key, and its link number, link_num.
</string>
<string name="LSLTipText_osIsUUID">
osIsUUID(string thing)
Checks if thing is a UUID. Returns 1 if thing is a valid UUID, 0 otherwise.
</string>
<string name="LSLTipText_osMin">
osMin(float A, float B)
Returns the smaller of two numbers. Wraps to system Math.Min()
</string>
<string name="LSLTipText_osMax">
osMax(float A, float B)
Returns the larger of two numbers. Wraps to system Math.Max()
</string>
<string name="LSLTipText_osGetRezzingObject">
osGetRezzingObject()
Get the key of the object that rezzed this object. Will return NULL_KEY if rezzed by agent or otherwise unknown source.
</string>
<string name="LSLTipText_osGetHealth">
osGetHealth(key avatar)
Returns avatar's health in float value.
</string>
<string name="LSLTipText_osSetContentType">
osSetContentType(key id, string type)
Sets the response type for an HTTP request/response.
</string>
<string name="LSLTipText_osGetNumberOfAttachments">
osGetNumberOfAttachments(key avatar, list attachmentPoints)
Returns a strided list of the specified attachmentPoints and the number of attachments on those points. "avatar" = avatar UUID, "attachmentPoints" = list of ATTACH_* constants.
</string>
<string name="LSLTipText_osMessageAttachments">
osMessageAttachments(key avatar, string message, list attachmentPoints, integer flags)
Sends message to avatar's attachments on the specified attachmentPoints. Behaves as osMessageObject(), without the sending script needing to know the attachment keys in advance. "avatar" =avatar UUID, "message" = message string. "attachmentPoints" = list of ATTACH_* constants, or -1 for all attachments. If -1 is specified and OS_ATTACH_MSG_INVERT_POINTS is present in flags, no action is taken.. "flags" = flags further constraining the attachments to deliver the message to.
</string>
<string name="LSLTipText_osDropAttachment">
osDropAttachment()
Attempts to drop an attachment to the ground.
</string>
<string name="LSLTipText_osDropAttachmentAt">
osDropAttachmentAt(vector pos, rotation rot)
Attempts to drop an attachment at the specified coordinates. "pos" = vector position "rot" = rotation of object.
</string>
<string name="LSLTipText_osForceDropAttachment">
osForceDropAttachment()
Attempts to drop an attachment to the ground while bypassing the script permissions.
</string>
<string name="LSLTipText_osForceDropAttachmentAt">
osForceDropAttachmentAt(vector pos, rotation rot)
Attempts to drop an attachment at the specified coordinates while bypassing the script permissions. "pos" = vector position "rot" = rotation of object.
</string>
<string name="LSLTipText_osListenRegex">
osListenRegex(integer channelID, string name, string ID, string msg, integer regexBitfield)
Identical to llListen except for a bitfield which indicates which string parameters should be parsed as regex patterns. Params = integer channelID, string name, string ID, string msg, integer regexBitfield. Where regexBitfield = OS_LISTEN_REGEX_NAME or OS_LISTEN_REGEX_MESSAGE.
</string>
<string name="LSLTipText_osRegexIsMatch">
osRegexIsMatch(string input, string pattern)
Wraps to bool Regex.IsMatch(string input, string pattern)
string input = string to test for match
string pattern = string to use as pattern
returns boolean TRUE/FALSE.
</string>
<string name="LSLTipText_cmSetWindlightScene">
cmSetWindlightScene(list rules)
Set the current WindLight scene. Estate managers and owners only.
@@ -2726,6 +2804,52 @@ STOP_TIME_REVERSAL_SAVING, START_TIME_REVERSAL, STOP_TIME_REVERSAL.
<string name="LSLTipText_aaGetIsInfiniteRegion">
aaGetIsInfiniteRegion()
Returns TRUE or FALSE if region is an infinite region.
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaSetCharacterStat">
aaSetCharacterStat( ID, StatName, statValue)
Sets Character Stats. Where ID = avatar uuid, StatName = stat to change, statValue the value to change it to.
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaAllRegionInstanceSay">
aaAllRegionInstanceSay(integer channelID, string text)
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaWindlightGetDayCycle">
aaWindlightGetDayCycle()
Returns a List of settings
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaWindlightAddDayCycleFrame">
aaWindlightAddDayCycleFrame(float dayCyclePosition, integer dayCycleFrameToCopy)
Returns TRUE / FALSE on success status
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaWindlightRemoveDayCycleFrame">
aaWindlightRemoveDayCycleFrame(int dayCycleFrame)
Returns TRUE / FALSE on success status
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaWindlightSetScene">
aaWindlightSetScene(list list)
aaWindlightSetScene(integer dayCycleIndex, list list)
Returns TRUE/FALSE on success
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaWindlightGetScene">
aaWindlightGetScene(list rules)
aaWindlightGetScene(integer dayCycleKeyFrame, list rules)
Returns a list
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaWindlightGetSceneIsStatic">
aaWindlightGetSceneIsStatic()
Returns TRUE / FALSE
(Aurora-Sim only)
</string>
<string name="LSLTipText_aaWindlightGetSceneDayCycleKeyFrameCount">
aaWindlightGetSceneDayCycleKeyFrameCount()
Returns integer value
(Aurora-Sim only)
</string>
<string name="LSLTipText_botGetWaitingTime">

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

@@ -702,6 +702,22 @@ CHARACTER_MAX_TURN_RADIUS TODO: add documentation
# OpenSim Constants (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\LSL_Constants.cs)
# Constants for cmWindlight (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\CM_Constants.cs)
CHANGED_ANIMATION OpenSim change event animation change detection.
CAMERA_FOCUS_OFFSET_X OpenSim enhancement for llSetCameraParams(), adjusts the camera focus x position relative to the target. (float)
CAMERA_FOCUS_OFFSET_Y OpenSim enhancement for llSetCameraParams(), adjusts the camera focus y position relative to the target. (float)
CAMERA_FOCUS_OFFSET_Z OpenSim enhancement for llSetCameraParams(), adjusts the camera focus z position relative to the target. (float)
CAMERA_POSITION_X OpenSim enhancement for llSetCameraParams(), sets camera x position in region coordinates. (float)
CAMERA_POSITION_Y OpenSim enhancement for llSetCameraParams(), sets camera y position in region coordinates. (float)
CAMERA_POSITION_Z OpenSim enhancement for llSetCameraParams(), sets camera z position in region coordinates. (float)
CAMERA_FOCUS_X OpenSim enhancement for llSetCameraParams(), sets camera x focus (target position) in region coordinates. (float)
CAMERA_FOCUS_Y OpenSim enhancement for llSetCameraParams(), sets camera y focus (target position) in region coordinates. (float)
CAMERA_FOCUS_Z OpenSim enhancement for llSetCameraParams(), sets camera z focus (target position) in region coordinates. (float)
OS_LISTEN_REGEX_NAME Value 0x1, process name parameter as regex
OS_LISTEN_REGEX_MESSAGE Value 0x2, process name parameter as regex
OS_ATTACH_MSG_ALL Used with osMessageAttachements
OS_ATTACH_MSG_INVERT_POINTS Used with osMessageAttachements
OS_ATTACH_MSG_OBJECT_CREATOR Used with osMessageAttachements
OS_ATTACH_MSG_SCRIPT_CREATOR Used with osMessageAttachements
PARCEL_DETAILS_CLAIMDATE Used with osSetParcelDetails
# osGetRegionStats
STATS_TIME_DILATION returned value from osGetRegionStats(), 1st of 21 items in returned list.
STATS_SIM_FPS returned value from osGetRegionStats(), 2nd of 21 items in returned list.
@@ -725,14 +741,15 @@ STATS_PENDING_UPLOADS returned value from osGetRegionStats(), 19th of 21 items
STATS_ACTIVE_SCRIPTS returned value from osGetRegionStats(), 20th of 21 items in returned list.
STATS_SCRIPT_LPS returned value from osGetRegionStats(), 21st of 21 items in returned list.
# OpenSim NPC
OS_NPC_FLY used by osNPC.
OS_NPC_NO_FLY used by osNPC.
OS_NPC_LAND_AT_TARGET used by osNPC.
OS_NPC_SIT_NOW used by osNPC.
OS_NPC_CREATOR_OWNED used by osNPC.
OS_NPC_NOT_OWNED used by osNPC.
OS_NPC_SENSE_AS_AGENT used by osNPC.
OS_NPC_RUNNING used by osNPC.
OS_NPC used by osNPC. Value 0x01000000
OS_NPC_FLY used by osNPC. Value 0
OS_NPC_NO_FLY used by osNPC. Value 1
OS_NPC_LAND_AT_TARGET used by osNPC. Value 2
OS_NPC_SIT_NOW used by osNPC. Value 0
OS_NPC_CREATOR_OWNED used by osNPC. Value 0x1
OS_NPC_NOT_OWNED used by osNPC. Value 0x2
OS_NPC_SENSE_AS_AGENT used by osNPC. Value 0x4
OS_NPC_RUNNING used by osNPC. Value 4
# Windlight/Lightshare
WL_WATER_COLOR Windlight Water Colour
WL_WATER_FOG_DENSITY_EXPONENT Windlight Water Fog Density Exponent
@@ -771,7 +788,15 @@ WL_CLOUD_SCROLL_Y Windlight Cloud Scroll Y
WL_CLOUD_SCROLL_Y_LOCK Windlight Cloud Scroll Y Lock
WL_CLOUD_SCROLL_X_LOCK Windlight Cloud Scroll X Lock
WL_DRAW_CLASSIC_CLOUDS Windlight Draw Classic Clouds
# Aurora-Sim Constants (\Aurora\AuroraDotNetEngine\APIs\AA_Constants.cs) -->
# WL Constants added unique to Aurora-Sim
WL_OK Value -1
WL_ERROR Value -2
WL_ERROR_NO_SCENE_SET Value -3
WL_ERROR_SCENE_MUST_BE_STATIC Value -4
WL_ERROR_SCENE_MUST_NOT_BE_STATIC Value -5
WL_ERROR_BAD_SETTING Value -6
WL_ERROR_NO_PRESET_FOUND Value -7
# Aurora-Sim Constants (\Aurora\AuroraDotNetEngine\APIs\AA_Constants.cs)
ENABLE_GRAVITY enable_gravity.
GRAVITY_FORCE_X gravity_force_x.
GRAVITY_FORCE_Y gravity_force_y.