diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index dd50567cd..0cc3d6693 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -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.
diff --git a/indra/newview/app_settings/lsl_functions_os.xml b/indra/newview/app_settings/lsl_functions_os.xml
index 05e1c94f8..1d19505b3 100644
--- a/indra/newview/app_settings/lsl_functions_os.xml
+++ b/indra/newview/app_settings/lsl_functions_os.xml
@@ -247,6 +247,46 @@
osNpcWhisper
+ osForceAttachToAvatar
+
+ osForceAttachToAvatarFromInventory
+
+ osForceAttachToOtherAvatarFromInventory
+
+ osNpcTouch
+
+ osNpcTouch
+
+ osIsUUID
+
+ osMin
+
+ osMax
+
+ osMax
+
+ osGetRezzingObject
+
+ osGetHealth
+
+ osSetContentType
+
+ osGetNumberOfAttachments
+
+ osMessageAttachments
+
+ osDropAttachments
+
+ osDropAttachmentsAt
+
+ osForceDropAttachments
+
+ osForceDropAttachmentsAt
+
+ osListenRegex
+
+ osRegexIsMatch
+
osReturnObject
@@ -334,6 +374,24 @@
aaGetIsInfiniteRegion
+ aaSetCharacterStat
+
+ aaAllRegionInstanceSay
+
+ aaWindlightGetDayCycle
+
+ aaWindlightAddDayCycleFrame
+
+ aaWindlightRemoveDayCycleFrame
+
+ aaWindlightSetScene
+
+ aaWindlightGetScene
+
+ aaWindlightGetSceneIsStatic
+
+ aaWindlightGetSceneDayCycleKeyFrameCount
+
botGetWaitingTime
@@ -370,4 +428,4 @@
botRemoveBotsWithTag
-
\ No newline at end of file
+
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 486fcf321..1570f8114 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -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)
+
+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.
+
+
+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.
+
+
+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.
+
+
+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.
+
+
+osIsUUID(string thing)
+Checks if thing is a UUID. Returns 1 if thing is a valid UUID, 0 otherwise.
+
+
+osMin(float A, float B)
+Returns the smaller of two numbers. Wraps to system Math.Min()
+
+
+osMax(float A, float B)
+Returns the larger of two numbers. Wraps to system Math.Max()
+
+
+osGetRezzingObject()
+Get the key of the object that rezzed this object. Will return NULL_KEY if rezzed by agent or otherwise unknown source.
+
+
+osGetHealth(key avatar)
+Returns avatar's health in float value.
+
+
+osSetContentType(key id, string type)
+Sets the response type for an HTTP request/response.
+
+
+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.
+
+
+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.
+
+
+osDropAttachment()
+Attempts to drop an attachment to the ground.
+
+
+osDropAttachmentAt(vector pos, rotation rot)
+Attempts to drop an attachment at the specified coordinates. "pos" = vector position "rot" = rotation of object.
+
+
+osForceDropAttachment()
+Attempts to drop an attachment to the ground while bypassing the script permissions.
+
+
+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.
+
+
+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.
+
+
+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.
+
+
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.
aaGetIsInfiniteRegion()
Returns TRUE or FALSE if region is an infinite region.
+(Aurora-Sim only)
+
+
+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)
+
+
+aaAllRegionInstanceSay(integer channelID, string text)
+(Aurora-Sim only)
+
+
+aaWindlightGetDayCycle()
+Returns a List of settings
+(Aurora-Sim only)
+
+
+aaWindlightAddDayCycleFrame(float dayCyclePosition, integer dayCycleFrameToCopy)
+Returns TRUE / FALSE on success status
+(Aurora-Sim only)
+
+
+aaWindlightRemoveDayCycleFrame(int dayCycleFrame)
+Returns TRUE / FALSE on success status
+(Aurora-Sim only)
+
+
+aaWindlightSetScene(list list)
+aaWindlightSetScene(integer dayCycleIndex, list list)
+Returns TRUE/FALSE on success
+(Aurora-Sim only)
+
+
+aaWindlightGetScene(list rules)
+aaWindlightGetScene(integer dayCycleKeyFrame, list rules)
+Returns a list
+(Aurora-Sim only)
+
+
+aaWindlightGetSceneIsStatic()
+Returns TRUE / FALSE
+(Aurora-Sim only)
+
+
+aaWindlightGetSceneDayCycleKeyFrameCount()
+Returns integer value
(Aurora-Sim only)
diff --git a/indra/newview/skins/gemini/keywords.ini b/indra/newview/skins/gemini/keywords.ini
index 373412a44..2d140eb70 100644
--- a/indra/newview/skins/gemini/keywords.ini
+++ b/indra/newview/skins/gemini/keywords.ini
@@ -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.