merge changes for storm-1642

1 files changed, 41 insertions, 41 deletions

diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 9fa4046fdf..b5f105439c 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -10,7 +10,7 @@ state 			Keyword to indicate state block or state transition
 integer			Integer type
 float			Floating-point type
 string			String type
-key				Key type.  Use NULL_KEY to test for empty keys.
+key				Key type.  Use NULL_KEY to test for empty keys
 vector			Vector type of 3 floats.  Used to represent 3D motion, Euler angles, and color.:Access components by .x, .y. or .z
 rotation		Rotation type of 4 floats.  Used to represent rotation.:Access components by .x, .y., .z, or .w
 list			List of various data types
@@ -28,7 +28,7 @@ collision_end	collision_end(integer num_detected):Triggered when task stops coll
 land_collision_start	land_collision_start(vector pos):Triggered when task starts colliding with land
 land_collision			land_collision(vector pos):Triggered when task is colliding with land
 land_collision_end		land_collision_end(vector pos):Triggered when task stops colliding with land
-timer			timer():Result of the llSetTimerEvent library function call.
+timer			timer():Result of the llSetTimerEvent library function call
 listen			listen(integer channel, string name, key id, string message):Result of the llListen library function call
 sensor			sensor(integer num_detected):Result of the llSensor library function call
 no_sensor		no_sensor():Result of the llSensor library function call
@@ -44,8 +44,8 @@ attach			attach(key id):Triggered when task attaches or detaches from agent
 dataserver      dataserver(key queryid, string data):Triggered when task receives asynchronous data
 moving_start	moving_start():Triggered when task begins moving
 moving_end		moving_end():Triggered when task stops moving
-on_rez			on_rez(integer start_param):Triggered when task is rezed in from inventory or another task
-object_rez		object_rez(key id):Triggered when task rezes in another task
+on_rez			on_rez(integer start_param):Triggered when task is rezzed in from inventory or another task
+object_rez		object_rez(key id):Triggered when task rezzes in another task
 link_message	link_message(integer sender_num, integer num, string str, key id):Triggered when task receives a link message via LLMessageLinked library function call
 changed			changed( integer change ):Triggered various event change the task:(test change with CHANGED_INVENTORY, CHANGED_COLOR, CHANGED_SHAPE, CHANGED_SCALE, CHANGED_TEXTURE, CHANGED_LINK, CHANGED_ALLOWED_DROP, CHANGED_OWNER, CHANGED_REGION, CHANGED_TELEPORT, CHANGED_REGION_START, CHANGED_MEDIA)
 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)
@@ -151,15 +151,15 @@ PSYS_SRC_PATTERN_ANGLE
 PSYS_SRC_PATTERN_ANGLE_CONE
 PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY
 
-OBJECT_UNKNOWN_DETAIL	Returned by llGetObjectDetails when passed an invalid object parameter type.
-OBJECT_NAME				Used with llGetObjectDetails to get an object's name.
-OBJECT_DESC				Used with llGetObjectDetails to get an object's description.
-OBJECT_POS				Used with llGetObjectDetails to get an object's position.
-OBJECT_ROT				Used with llGetObjectDetails to get an object's rotation.
-OBJECT_VELOCITY			Used with llGetObjectDetails to get an object's velocity.
-OBJECT_OWNER			Used with llGetObjectDetails to get an object's owner's key.  Will be NULL_KEY if group owned.
-OBJECT_GROUP			Used with llGetObjectDetails to get an object's group's key.
-OBJECT_CREATOR			Used with llGetObjectDetails to get an object's creator's key.
+OBJECT_UNKNOWN_DETAIL	Returned by llGetObjectDetails when passed an invalid object parameter type
+OBJECT_NAME				Used with llGetObjectDetails to get an object's name
+OBJECT_DESC				Used with llGetObjectDetails to get an object's description
+OBJECT_POS				Used with llGetObjectDetails to get an object's position
+OBJECT_ROT				Used with llGetObjectDetails to get an object's rotation
+OBJECT_VELOCITY			Used with llGetObjectDetails to get an object's velocity
+OBJECT_OWNER			Used with llGetObjectDetails to get an object's owner's key.  Will be NULL_KEY if group owned
+OBJECT_GROUP			Used with llGetObjectDetails to get an object's group's key
+OBJECT_CREATOR			Used with llGetObjectDetails to get an object's creator's key
 
 # some vehicle params
 VEHICLE_TYPE_NONE
@@ -198,7 +198,7 @@ VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY	A slider between 0 (bouncy) and 1 (critic
 VEHICLE_VERTICAL_ATTRACTION_TIMESCALE	The exponential timescale for the vehicle to align its z-axis to the world z-axis (vertical)
 
 VEHICLE_BANKING_EFFICIENCY	A slider between -1 (leans out of turns), 0 (no banking), and +1 (leans into turns)
-VEHICLE_BANKING_MIX			A slider betwen 0 (static banking) and 1 (dynamic banking)
+VEHICLE_BANKING_MIX			A slider between 0 (static banking) and 1 (dynamic banking)
 VEHICLE_BANKING_TIMESCALE	The exponential timescale for the banking behavior to take full effect
 
 VEHICLE_FLAG_NO_DEFLECTION_UP	Prevents linear deflection along world-z axis
@@ -208,9 +208,9 @@ VEHICLE_FLAG_HOVER_TERRAIN_ONLY	Hover only pays attention to terrain height
 VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT Hover only pays attention to global height
 VEHICLE_FLAG_HOVER_UP_ONLY 		Hover only pushes up
 VEHICLE_FLAG_LIMIT_MOTOR_UP		Prevents ground vehicles from motoring into the sky
-VEHICLE_FLAG_MOUSELOOK_STEER	Makes vehicle try to turn toward mouselook direction.
-VEHICLE_FLAG_MOUSELOOK_BANK		Makes vehicle try to turn toward mouselook direction assuming banking is enabled.
-VEHICLE_FLAG_CAMERA_DECOUPLED 	Causes the camera look-at axis to NOT move when the vehicle rotates.
+VEHICLE_FLAG_MOUSELOOK_STEER	Makes vehicle try to turn toward mouselook direction
+VEHICLE_FLAG_MOUSELOOK_BANK		Makes vehicle try to turn toward mouselook direction assuming banking is enabled
+VEHICLE_FLAG_CAMERA_DECOUPLED 	Causes the camera look-at axis to NOT move when the vehicle rotates
 
 CAMERA_PITCH				(-45 to 80) (Adjusts the angular amount that the camera aims straight ahead vs. straight down, maintaining the same distance. Analogous to 'incidence'.")
 CAMERA_FOCUS_OFFSET			(-10 to 10) A vector that adjusts the position of the camera focus position relative to the subject
@@ -238,7 +238,7 @@ INVENTORY_BODYPART	Passed to task inventory library functions to reference body
 INVENTORY_ANIMATION	Passed to task inventory library functions to reference animations
 INVENTORY_GESTURE	Passed to task inventory library functions to reference gestures
 INVENTORY_ALL		Passed to task inventory library functions to reference all inventory items
-INVENTORY_NONE		Returned by llGetInventoryType when no item is found.
+INVENTORY_NONE		Returned by llGetInventoryType when no item is found
 
 ATTACH_CHEST		Passed to llAttachToAvatar to attach task to chest
 ATTACH_HEAD			Passed to llAttachToAvatar to attach task to head
@@ -256,7 +256,7 @@ ATTACH_LEAR			Passed to llAttachToAvatar to attach task to left ear
 ATTACH_REAR			Passed to llAttachToAvatar to attach task to right ear
 ATTACH_LEYE			Passed to llAttachToAvatar to attach task to left eye
 ATTACH_REYE			Passed to llAttachToAvatar to attach task to right eye
-ATTACH_NOSE			Passed to llAttachToAvatar to attach task to noce
+ATTACH_NOSE			Passed to llAttachToAvatar to attach task to nose
 ATTACH_RUARM		Passed to llAttachToAvatar to attach task to right upper arm
 ATTACH_RLARM		Passed to llAttachToAvatar to attach task to right lower arm
 ATTACH_LUARM		Passed to llAttachToAvatar to attach task to left upper arm
@@ -296,7 +296,7 @@ PAYMENT_INFO_USED	Used with llRequestAgentData to tell if Agent is of "Payment I
 ANIM_ON				Enable texture animation
 LOOP				Loop when animating textures
 REVERSE				Animate in the reverse direction
-PING_PONG			Animate forward, then reverse.
+PING_PONG			Animate forward, then reverse
 SMOOTH				Textures slides, instead of stepping
 ROTATE				Rotates the texture, instead of using frames
 SCALE				Scales the texture, instead of using frames
@@ -343,7 +343,7 @@ PRIM_FLEXIBLE		Followed by TRUE or FALSE, integer softness, float gravity, float
 PRIM_POINT_LIGHT	Followed by TRUE or FALSE, vector color, float intensity, float radius, float falloff
 PRIM_TEMP_ON_REZ	Sets temporay on rez to TRUE or FALSE
 PRIM_PHANTOM		Sets phantom to TRUE or FALSE
-PRIM_CAST_SHADOWS	DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams.
+PRIM_CAST_SHADOWS	DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams
 PRIM_POSITION		Sets primitive position to a vector position
 PRIM_SIZE			Sets primitive size to a vector size
 PRIM_ROTATION		Sets primitive rotation
@@ -363,10 +363,10 @@ PRIM_TYPE_TUBE		Followed by integer hole shape, vector cut, float hollow, vector
 PRIM_TYPE_RING		Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew
 PRIM_TYPE_SCULPT	Followed by a key/string texture uuid, and one of PRIM_SCULPT_TYPE_SPHERE, PRIM_SCULPT_TYPE_TORUS, PRIM_SCULPT_TYPE_PLANE, or PRIM_SCULPT_TYPE_CYLINDER
 
-PRIM_HOLE_DEFAULT	Sets hole type to match the prim type.
-PRIM_HOLE_SQUARE	Sets hole type to square.
-PRIM_HOLE_CIRCLE	Sets hole type to circle.
-PRIM_HOLE_TRIANGLE	Sets hole type to triangle.
+PRIM_HOLE_DEFAULT	Sets hole type to match the prim type
+PRIM_HOLE_SQUARE	Sets hole type to square
+PRIM_HOLE_CIRCLE	Sets hole type to circle
+PRIM_HOLE_TRIANGLE	Sets hole type to triangle
 
 PRIM_MATERIAL_STONE		Sets material to stone
 PRIM_MATERIAL_METAL		Sets material to metal
@@ -436,7 +436,7 @@ PARCEL_MEDIA_COMMAND_TIME Set media stream to specific time
 PARCEL_MEDIA_COMMAND_SIZE Get or set the parcel's media pixel resolution
 PARCEL_MEDIA_COMMAND_AGENT Allows media stream commands to apply to only one agent
 PARCEL_MEDIA_COMMAND_UNLOAD Unloads the media stream
-PARCEL_MEDIA_COMMAND_AUTO_ALIGN Auto aligns the media stream to the texture size.  May cause a performance hit and loss of some visual quality.
+PARCEL_MEDIA_COMMAND_AUTO_ALIGN Auto aligns the media stream to the texture size.  May cause a performance hit and loss of some visual quality
 
 PAY_HIDE			Used with llSetPayPrice to hide a button
 PAY_DEFAULT			Used with llSetPayPrice to use the default price for a button
@@ -481,7 +481,7 @@ REGION_FLAG_RESTRICT_PUSHOBJECT		Used with llGetRegionFlags to find if a region
 
 HTTP_METHOD                         Used with llHTTPRequest to specify the method, such as "GET" or "POST"
 HTTP_MIMETYPE                       Used with llHTTPRequest to specify the MIME type, defaults to "text/plain"
-HTTP_BODY_MAXLENGTH                 Used with llHTTPRequest to specify the maxium reponse body to return
+HTTP_BODY_MAXLENGTH                 Used with llHTTPRequest to specify the maximum response body to return
 HTTP_VERIFY_CERT                    Used with llHTTPRequest to specify SSL certificate verification
 HTTP_BODY_TRUNCATED                 Used with http_response to indicate truncation point in bytes
 
@@ -492,17 +492,17 @@ PARCEL_COUNT_OTHER		Used with llGetParcelPrimCount to get the number of prims on
 PARCEL_COUNT_SELECTED	Used with llGetParcelPrimCount to get the number of prims on the parcel currently selected or sat upon
 PARCEL_COUNT_TEMP		Used with llGetParcelPrimCount to get the number of prims on the parcel that are temp on rez
 
-PARCEL_DETAILS_NAME		Used with llGetParcelDetails to get the parcel name.
-PARCEL_DETAILS_DESC		Used with llGetParcelDetails to get the parcel description.
-PARCEL_DETAILS_OWNER	Used with llGetParcelDetails to get the parcel owner id.
-PARCEL_DETAILS_GROUP	Used with llGetParcelDetails to get the parcel group id.
-PARCEL_DETAILS_AREA		Used with llGetParcelDetails to get the parcel area in square meters.
-PARCEL_DETAILS_ID		Used with llGetParcelDetails to get the parcel id.
-PARCEL_DETAILS_SEE_AVATARS	Used with llGetParcelDetails to get the avatars visibility setting.
+PARCEL_DETAILS_NAME		Used with llGetParcelDetails to get the parcel name
+PARCEL_DETAILS_DESC		Used with llGetParcelDetails to get the parcel description
+PARCEL_DETAILS_OWNER	Used with llGetParcelDetails to get the parcel owner id
+PARCEL_DETAILS_GROUP	Used with llGetParcelDetails to get the parcel group id
+PARCEL_DETAILS_AREA		Used with llGetParcelDetails to get the parcel area in square meters
+PARCEL_DETAILS_ID		Used with llGetParcelDetails to get the parcel id
+PARCEL_DETAILS_SEE_AVATARS	Used with llGetParcelDetails to get the avatars visibility setting
 
-STRING_TRIM_HEAD		Used with llStringTrim to trim leading spaces from a string.
-STRING_TRIM_TAIL		Used with llStringTrim to trim trailing spaces from a string.
-STRING_TRIM				Used with llStringTrim to trim both leading and trailing spaces from a string.
+STRING_TRIM_HEAD		Used with llStringTrim to trim leading spaces from a string
+STRING_TRIM_TAIL		Used with llStringTrim to trim trailing spaces from a string
+STRING_TRIM				Used with llStringTrim to trim both leading and trailing spaces from a string
 
 CLICK_ACTION_NONE       Used with llSetClickAction to disable the click action
 CLICK_ACTION_TOUCH      Used with llSetClickAction to set touch as the default action when object is clicked
@@ -514,9 +514,9 @@ CLICK_ACTION_PLAY       Used with llSetClickAction to set play as the default ac
 CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the default action when object is clicked
 CLICK_ACTION_ZOOM       Used with llSetClickAction to set zoom in as the default action when object is clicked
 
-TOUCH_INVALID_TEXCOORD  Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid.
-TOUCH_INVALID_VECTOR    Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid.
-TOUCH_INVALID_FACE      Value returned by llDetectedTouchFace() when the touch position is not valid.
+TOUCH_INVALID_TEXCOORD  Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid
+TOUCH_INVALID_VECTOR    Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid
+TOUCH_INVALID_FACE      Value returned by llDetectedTouchFace() when the touch position is not valid
 
 PRIM_MEDIA_ALT_IMAGE_ENABLE            Used with ll{Get,Set}PrimMediaParams to enable the default alt image for media 
 PRIM_MEDIA_CONTROLS                    Used with ll{Get,Set}PrimMediaParams to determine the controls shown for media
@@ -608,4 +608,4 @@ return				Leave current function or event handler
 [two_sided_delimiter 0, .2, 0]
 "					String literal
 
-#functions are supplied by the program now.
+#functions are supplied by the program now