Merge STORM-959

5 files changed, 395 insertions, 616 deletions

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
new file mode 100644
index 0000000000..a44b895f7b
--- /dev/null
+++ b/indra/newview/app_settings/commands.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<commands>
+  <command name="aboutland"
+           available_in_toybox="true"
+           icon="Command_AboutLand_Icon"
+           label_ref="Command_AboutLand_Label"
+           tooltip_ref="Command_AboutLand_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="about_land"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="about_land"
+           />
+  <command name="appearance"  
+           available_in_toybox="true"
+           icon="Command_Appearance_Icon"
+           label_ref="Command_Appearance_Label"
+           tooltip_ref="Command_Appearance_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="appearance"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="appearance"
+           />
+  <command name="avatar"
+           available_in_toybox="true"
+           icon="Command_Avatar_Icon"
+           label_ref="Command_Avatar_Label"
+           tooltip_ref="Command_Avatar_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="avatar"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="avatar"
+           />
+  <command name="build"
+           available_in_toybox="true"
+           icon="Command_Build_Icon"
+           label_ref="Command_Build_Label"
+           tooltip_ref="Command_Build_Tooltip"
+           execute_function="Build.Toggle"
+           execute_parameters="build"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="build"
+           />
+  <command name="chat"
+           available_in_toybox="true"
+           icon="Command_Chat_Icon"
+           label_ref="Command_Chat_Label"
+           tooltip_ref="Command_Chat_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="chat_bar"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="chat_bar"
+           />
+  <command name="compass"
+           available_in_toybox="false"
+           icon="Command_Compass_Icon"
+           label_ref="Command_Compass_Label"
+           tooltip_ref="Command_Compass_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="compass"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="compass"
+           />
+  <command name="destinations"
+           available_in_toybox="true"
+           icon="Command_Destinations_Icon"
+           label_ref="Command_Destinations_Label"
+           tooltip_ref="Command_Destinations_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="destinations"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="destinations"
+           />
+  <command name="gestures"
+           available_in_toybox="true"
+           icon="Command_Gestures_Icon"
+           label_ref="Command_Gestures_Label"
+           tooltip_ref="Command_Gestures_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="gestures"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="gestures"
+           />
+  <command name="howto"
+           available_in_toybox="true"
+           icon="Command_HowTo_Icon"
+           label_ref="Command_HowTo_Label"
+           tooltip_ref="Command_HowTo_Tooltip"
+           execute_function="Help.ToggleHowTo"
+           is_running_function="Help.HowToVisible"
+           />
+  <command name="inventory"
+           available_in_toybox="true"
+           icon="Command_Inventory_Icon"
+           label_ref="Command_Inventory_Label"
+           tooltip_ref="Command_Inventory_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="inventory"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="inventory"
+           />
+  <command name="map"
+           available_in_toybox="true"
+           icon="Command_Map_Icon"
+           label_ref="Command_Map_Label"
+           tooltip_ref="Command_Map_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="world_map"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="world_map"
+           />
+  <command name="marketplace"
+           available_in_toybox="false"
+           icon="Command_Marketplace_Icon"
+           label_ref="Command_Marketplace_Label"
+           tooltip_ref="Command_Marketplace_Tooltip"
+           execute_function="Avatar.OpenMarketplace"
+           />
+  <command name="minimap"
+           available_in_toybox="true"
+           icon="Command_MiniMap_Icon"
+           label_ref="Command_MiniMap_Label"
+           tooltip_ref="Command_MiniMap_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="mini_map"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="mini_map"
+           />
+  <command name="move"
+           available_in_toybox="true"
+           icon="Command_Move_Icon"
+           label_ref="Command_Move_Label"
+           tooltip_ref="Command_Move_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="moveview"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="moveview"
+           />
+  <command name="people"
+           available_in_toybox="true"
+           icon="Command_People_Icon"
+           label_ref="Command_People_Label"
+           tooltip_ref="Command_People_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="people"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="people"
+           />
+  <command name="picks"
+           available_in_toybox="true"
+           icon="Command_Picks_Icon"
+           label_ref="Command_Picks_Label"
+           tooltip_ref="Command_Picks_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="picks"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="picks"
+           />
+  <command name="places"
+           available_in_toybox="true"
+           icon="Command_Places_Icon"
+           label_ref="Command_Places_Label"
+           tooltip_ref="Command_Places_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="places"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="places"
+           />
+  <command name="preferences"
+           available_in_toybox="true"
+           icon="Command_Preferences_Icon"
+           label_ref="Command_Preferences_Label"
+           tooltip_ref="Command_Preferences_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="preferences"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="preferences"
+           />
+  <command name="profile"
+           available_in_toybox="true"
+           icon="Command_Profile_Icon"
+           label_ref="Command_Profile_Label"
+           tooltip_ref="Command_Profile_Tooltip"
+           execute_function="Avatar.ToggleMyProfile"
+           is_running_function="Avatar.IsMyProfileOpen"
+           />
+  <command name="search"
+           available_in_toybox="true"
+           icon="Command_Search_Icon"
+           label_ref="Command_Search_Label"
+           tooltip_ref="Command_Search_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="search"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="search"
+           />
+  <command name="snapshot"
+           available_in_toybox="true"
+           icon="Command_Snapshot_Icon"
+           label_ref="Command_Snapshot_Label"
+           tooltip_ref="Command_Snapshot_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="snapshot"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="snapshot"
+           />
+  <command name="speak"
+           available_in_toybox="true"
+           icon="Command_Speak_Icon"
+           label_ref="Command_Speak_Label"
+           tooltip_ref="Command_Speak_Tooltip"
+           execute_function="Agent.PressMicrophone"
+           execute_parameters="speak"
+           execute_stop_function="Agent.ReleaseMicrophone"
+           execute_stop_parameters="speak"
+           is_enabled_function="Agent.IsActionAllowed"
+           is_enabled_parameters="speak"
+           is_running_function="Agent.IsMicrophoneOn"
+           is_running_parameters="speak"
+           />
+  <command name="view"
+           available_in_toybox="true"
+           icon="Command_View_Icon"
+           label_ref="Command_View_Label"
+           tooltip_ref="Command_View_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="camera"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="camera"
+           />
+  <command name="voice"
+           available_in_toybox="true"
+           icon="Command_Voice_Icon"
+           label_ref="Command_Voice_Label"
+           tooltip_ref="Command_Voice_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="voice_controls"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="voice_controls"
+           />
+</commands>
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index 810a10feec..82b43432eb 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
@@ -610,4 +610,4 @@ return				Leave current function or event handler
 [double_quotation_marks 0, .2, 0]
 "					String literal
 
-#functions are supplied by the program now.
+#functions are supplied by the program now
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 15f1bbd1b1..3c53a9d44c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -619,7 +619,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string></string>
+      <string>http://lecs-viewer-web-components.s3.amazonaws.com/v3.0/[GRID_LOWERCASE]/avatars.html</string>
     </map>
     <key>AvatarBakedTextureUploadTimeout</key>
     <map>
@@ -1150,28 +1150,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ButtonFlashCount</key>
-    <map>
-      <key>Comment</key>
-      <string>Number of flashes after which flashing buttons stay lit up</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>8</integer>
-    </map>
-    <key>ButtonFlashRate</key>
-    <map>
-      <key>Comment</key>
-      <string>Frequency at which buttons flash (hz)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>1.25</real>
-    </map>
     <key>ButtonHPad</key>
     <map>
       <key>Comment</key>
@@ -2652,6 +2630,17 @@
       <key>Value</key>
       <integer>-1</integer>
     </map>
+    <key>DebugToolbarFUI</key>
+    <map>
+      <key>Comment</key>
+      <string>Turn on the FUI Toolbars</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>DebugViews</key>
     <map>
       <key>Comment</key>
@@ -2728,7 +2717,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string></string>
+      <string>http://lecs-viewer-web-components.s3.amazonaws.com/v3.0/[GRID_LOWERCASE]/guide.html</string>
     </map>
   <key>DisableCameraConstraints</key>
     <map>
@@ -3179,7 +3168,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>EnableVoiceChat</key>
     <map>
@@ -4039,6 +4028,17 @@
       <key>Value</key>
       <string>http://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC][DEBUG_MODE]</string>
     </map>
+    <key>HowToHelpURL</key>
+    <map>
+      <key>Comment</key>
+      <string>URL for How To help content</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>http://lecs-viewer-web-components.s3.amazonaws.com/v3.0/[GRID_LOWERCASE]/howto/index.html</string>
+    </map>    
     <key>HomeSidePanelURL</key>
     <map>
       <key>Comment</key>
@@ -4257,7 +4257,7 @@
         <key>Type</key>
         <string>Boolean</string>
         <key>Value</key>
-        <integer>0</integer>
+        <integer>1</integer>
     </map>
     <key>InventoryDisplayOutbox</key>
     <map>
@@ -4589,21 +4589,21 @@
         <key>Value</key>
             <integer>1</integer>
         </map>
-    <key>LastGPUClass</key>
+    <key>LastGPUString</key>
     <map>
       <key>Comment</key>
-      <string>[DO NOT MODIFY] previous GPU class for tracking hardware changes</string>
+      <string>[DO NOT MODIFY] previous GPU id string for tracking hardware changes</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>S32</string>
+      <string>String</string>
       <key>Value</key>
-      <integer>-1</integer>
+      <string></string>
     </map>
     <key>LastFeatureVersion</key>
     <map>
       <key>Comment</key>
-      <string>[DO NOT MODIFY] Version number for tracking hardware changes</string>
+      <string>[DO NOT MODIFY] Feature Table Version number for tracking rendering system changes</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -5094,7 +5094,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/</string>
+      <string>https://marketplace.secondlife.com/</string>
     </map>
     <key>MarketplaceURL_objectFemale</key>
     <map>
@@ -5105,7 +5105,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/attachments</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/attachments</string>
     </map>
     <key>MarketplaceURL_objectMale</key>
     <map>
@@ -5116,7 +5116,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/attachments</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/attachments</string>
     </map>
     <key>MarketplaceURL_clothingFemale</key>
     <map>
@@ -5127,7 +5127,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/clothing_female_avatar</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/clothing_female_avatar</string>
     </map>
     <key>MarketplaceURL_clothingMale</key>
     <map>
@@ -5138,7 +5138,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/clothing_male_avatar</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/clothing_male_avatar</string>
     </map>
     <key>MarketplaceURL_bodypartFemale</key>
     <map>
@@ -5149,7 +5149,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com</string>
+      <string>https://marketplace.secondlife.com/</string>
     </map>
     <key>MarketplaceURL_bodypartMale</key>
     <map>
@@ -5160,7 +5160,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/</string>
+      <string>https://marketplace.secondlife.com/</string>
     </map>
     <key>MarketplaceURL_glovesMale</key>
     <map>
@@ -5171,7 +5171,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string>
     </map>
     <key>MarketplaceURL_glovesFemale</key>
     <map>
@@ -5182,7 +5182,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/gloves_both_women_and_men</string>
     </map>
     <key>MarketplaceURL_jacketFemale</key>
     <map>
@@ -5193,7 +5193,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/jacket_womens</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/jacket_womens</string>
     </map>
     <key>MarketplaceURL_jacketMale</key>
     <map>
@@ -5204,7 +5204,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/jacket_mens</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/jacket_mens</string>
     </map>
     <key>MarketplaceURL_shirtFemale</key>
     <map>
@@ -5215,7 +5215,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/shirt_womens</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/shirt_womens</string>
     </map>
     <key>MarketplaceURL_shirtMale</key>
     <map>
@@ -5226,7 +5226,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/shirt_mens</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/shirt_mens</string>
     </map>
     <key>MarketplaceURL_undershirtFemale</key>
     <map>
@@ -5237,7 +5237,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/undershirt_womens</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/undershirt_womens</string>
     </map>
     <key>MarketplaceURL_undershirtMale</key>
     <map>
@@ -5248,7 +5248,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/undershirt_mens</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/undershirt_mens</string>
     </map>
     <key>MarketplaceURL_skirtFemale</key>
     <map>
@@ -5259,7 +5259,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string>
     </map>
     <key>MarketplaceURL_skirtMale</key>
     <map>
@@ -5270,7 +5270,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/skirts_women</string>
     </map>
     <key>MarketplaceURL_pantsFemale</key>
     <map>
@@ -5281,7 +5281,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/pants_women</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/pants_women</string>
     </map>
     <key>MarketplaceURL_pantsMale</key>
     <map>
@@ -5292,7 +5292,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/pants_men</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/pants_men</string>
     </map>
     <key>MarketplaceURL_underpantsFemale</key>
     <map>
@@ -5303,7 +5303,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/underwear_women</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/underwear_women</string>
     </map>
     <key>MarketplaceURL_underpantsMale</key>
     <map>
@@ -5314,7 +5314,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/underwear_men</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/underwear_men</string>
     </map>
     <key>MarketplaceURL_shoesFemale</key>
     <map>
@@ -5325,7 +5325,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/shoes_women</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/shoes_women</string>
     </map>
     <key>MarketplaceURL_shoesMale</key>
     <map>
@@ -5336,7 +5336,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/shoes_men</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/shoes_men</string>
     </map>
     <key>MarketplaceURL_socksFemale</key>
     <map>
@@ -5347,7 +5347,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/socks_women</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/socks_women</string>
     </map>
     <key>MarketplaceURL_socksMale</key>
     <map>
@@ -5358,7 +5358,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/socks_women</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/socks_women</string>
     </map>
     <key>MarketplaceURL_tattooMale</key>
     <map>
@@ -5369,7 +5369,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string>
     </map>
     <key>MarketplaceURL_tattooFemale</key>
     <map>
@@ -5380,7 +5380,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/tattoo_both_women_and_men</string>
     </map>
     <key>MarketplaceURL_hairFemale</key>
     <map>
@@ -5391,7 +5391,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_hair</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/womens_hair</string>
     </map>
     <key>MarketplaceURL_hairMale</key>
     <map>
@@ -5402,7 +5402,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_hair</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/mens_hair</string>
     </map>
     <key>MarketplaceURL_eyesFemale</key>
     <map>
@@ -5413,7 +5413,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_eyes</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/womens_eyes</string>
     </map>
     <key>MarketplaceURL_eyesMale</key>
     <map>
@@ -5424,7 +5424,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_eyes</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/mens_eyes</string>
     </map>
     <key>MarketplaceURL_shapeFemale</key>
     <map>
@@ -5435,7 +5435,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_shape</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/womens_shape</string>
     </map>
     <key>MarketplaceURL_shapeMale</key>
     <map>
@@ -5446,7 +5446,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_shape</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/mens_shape</string>
     </map>
     <key>MarketplaceURL_skinFemale</key>
     <map>
@@ -5457,7 +5457,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/womens_skin</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/womens_skin</string>
     </map>
     <key>MarketplaceURL_skinMale</key>
     <map>
@@ -5468,7 +5468,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://marketplace.secondlife.com/trampoline/viewer21/mens_skin</string>
+      <string>https://marketplace.secondlife.com/trampoline/viewer21/mens_skin</string>
     </map>
     <key>MaxDragDistance</key>
     <map>
@@ -7509,7 +7509,7 @@
       <key>Value</key>
       <integer>-1</integer>
     </map>
-  <key>RenderAvatarLODFactor</key>
+    <key>RenderAvatarLODFactor</key>
     <map>
       <key>Comment</key>
       <string>Controls level of detail of avatars (multiplier for current screen area when calculated level of detail)</string>
@@ -9731,7 +9731,7 @@
     <key>ShowBuildButton</key>
     <map>
       <key>Comment</key>
-      <string>Shows/Hides Build button in the bottom tray.</string>
+      <string>Shows/hides build button in the bottom tray.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9742,7 +9742,7 @@
     <key>ShowCameraButton</key>
     <map>
       <key>Comment</key>
-      <string>Show/Hide View button in the bottom tray.</string>
+      <string>Show/hide view button in the bottom tray.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9830,7 +9830,7 @@
     <key>ShowGestureButton</key>
     <map>
       <key>Comment</key>
-      <string>Shows/Hides Gesture button in the bottom tray.</string>
+      <string>Shows/hides gesture button in the bottom tray.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9863,7 +9863,7 @@
     <key>ShowMiniMapButton</key>
     <map>
       <key>Comment</key>
-      <string>Shows/Hides Mini-Map button in the bottom tray.</string>
+      <string>Shows/hides mini-map button in the bottom tray.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9874,7 +9874,7 @@
     <key>ShowMoveButton</key>
     <map>
       <key>Comment</key>
-      <string>Shows/Hides Move button in the bottom tray.</string>
+      <string>Shows/hides move button in the bottom tray.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9907,7 +9907,7 @@
     <key>ShowSearchButton</key>
     <map>
       <key>Comment</key>
-      <string>Shows/Hides Search button in the bottom tray.</string>
+      <string>Shows/hides search button in the bottom tray.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9918,7 +9918,7 @@
     <key>ShowSnapshotButton</key>
     <map>
       <key>Comment</key>
-      <string>Shows/Hides Snapshot button button in the bottom tray.</string>
+      <string>Shows/hides snapshot button button in the bottom tray.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9940,7 +9940,7 @@
     <key>ShowNavbarFavoritesPanel</key>    
     <map>
       <key>Comment</key>
-      <string>Show/Hide Navigation Bar Favorites Panel</string>
+      <string>Show/hide navigation bar favorites panel</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9951,7 +9951,7 @@
     <key>ShowNavbarNavigationPanel</key>        
     <map>
       <key>Comment</key>
-      <string>Show/Hide Navigation Bar Navigation Panel</string>
+      <string>Show/hide navigation bar navigation panel</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9962,7 +9962,7 @@
     <key>ShowWorldMapButton</key>
     <map>
       <key>Comment</key>
-      <string>Shows/Hides Map button in the bottom tray.</string>
+      <string>Shows/hides map button in the bottom tray.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9973,18 +9973,7 @@
     <key>ShowMiniLocationPanel</key>
     <map>
       <key>Comment</key>
-      <string>Show/Hide Mini-Location Panel</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>SidebarCameraMovement</key>
-    <map>
-      <key>Comment</key>
-      <string>Reflects world rect changing while changing sidebar visibility.</string>
+      <string>Show/hide mini-location panel</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -10927,7 +10916,17 @@
       <key>Value</key>
       <real>0.699999988079</real>
     </map>
-    <key>ToolTipFadeTime</key>
+     <key>ToolTipFastDelay</key>
+    <map>
+      <key>Comment</key>
+      <string>Seconds before displaying tooltip when mouse stops over UI element (when a tooltip is already visible)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.1</real>
+    </map>   <key>ToolTipFadeTime</key>
     <map>
       <key>Comment</key>
       <string>Seconds over which tooltip fades away</string>
@@ -13599,17 +13598,6 @@
       <key>Value</key>
       <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/404.html</string>
     </map>
-    <key>DestinationsAndAvatarsVisibility</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether destination panel or avatar picker are open (0=destination guide, 1=avatar picker, default=nothing)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>OpenIMOnVoice</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 29e52ab054..01a70f2671 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -1,474 +1 @@
-<llsd>
-  <map>
-    <key>ChannelBottomPanelMargin</key>
-        <map>
-        <key>Comment</key>
-            <string>Space from a lower toast to the Bottom Tray</string>
-        <key>Type</key>
-            <string>S32</string>
-        <key>Value</key>
-            <integer>2</integer>
-        </map>
-    <key>ClickActionBuyEnabled</key>
-        <map>
-        <key>Comment</key>
-            <string>Enable click to buy actions in tool pie menu</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-    <key>ClickActionPayEnabled</key>
-        <map>
-        <key>Comment</key>
-            <string>Enable click to pay actions in tool pie menu</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-    <key>EnableGrab</key>
-        <map>
-        <key>Comment</key>
-            <string>Use Ctrl+mouse to grab and manipulate objects</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-    <key>EnableMouselook</key>
-        <map>
-        <key>Comment</key>
-            <string>Allow first person perspective and mouse control of camera</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-    <key>HelpURLFormat</key>
-        <map>
-        <key>Comment</key>
-            <string>URL pattern for help page; arguments will be encoded; see llviewerhelp.cpp:buildHelpURL for arguments</string>
-        <key>Type</key>
-            <string>String</string>
-        <key>Value</key>
-            <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/howto/index.html?topic=[TOPIC]</string>
-        </map>
-    <key>PreferredMaturity</key>
-        <map>
-        <key>Comment</key>
-            <string>Setting for the user&apos;s preferred maturity level (consts in indra_constants.h)</string>
-        <key>Type</key>
-            <string>U32</string>
-        <key>Value</key>
-            <integer>21</integer>
-        </map>
-    <key>RenderTrackerBeacon</key>
-        <map>
-        <key>Comment</key>
-            <string>Display tracking arrow and beacon to target avatar, teleport destination</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-    <key>ShowScriptErrors</key>
-        <map>
-        <key>Comment</key>
-            <string>Show script errors</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-    <key>ShowScriptErrorsLocation</key>
-        <map>
-        <key>Comment</key>
-            <string>Show script error in chat or window</string>
-        <key>Type</key>
-            <string>S32</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-    <key>SkinCurrent</key>
-        <map>
-        <key>Comment</key>
-            <string>The currently selected skin.</string>
-        <key>Type</key>
-            <string>String</string>
-        <key>Value</key>
-            <string>minimal</string>
-        </map>
-    <key>UseExternalBrowser</key>
-        <map>
-        <key>Comment</key>
-            <string>Use default browser when opening web pages instead of in-world browser.</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-    <key>VoiceCallsRejectGroup</key>
-        <map>
-        <key>Comment</key>
-            <string>Silently reject all incoming group voice calls.</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>1</integer>
-        </map>
-    <key>VoiceDisableMic</key>
-        <map>
-        <key>Comment</key>
-            <string>Completely disable the ability to open the mic.</string>
-        <key>Type</key>
-            <string>Boolean</string>
-        <key>Value</key>
-            <integer>0</integer>
-        </map>
-      <key>ScriptsCanShowUI</key>
-      <map>
-        <key>Comment</key>
-        <string>Allow LSL calls (such as LLMapDestination) to spawn viewer UI</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>Boolean</string>
-        <key>Value</key>
-        <integer>0</integer>
-      </map>
-      <key>ChatFontSize</key>
-      <map>
-        <key>Comment</key>
-        <string>Size of chat text in chat console (0 = small, 1 = big, 2 = extra large)</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>S32</string>
-        <key>Value</key>
-        <integer>1</integer>
-      </map>
-      <key>AvatarPickerHintTimeout</key>
-      <map>
-        <key>Comment</key>
-        <string>Number of seconds to wait before telling resident about avatar picker.</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>F32</string>
-        <key>Value</key>
-        <real>0.0</real>
-      </map>
-    <key>RenderShowGroupTitleAll</key>
-    <map>
-      <key>Comment</key>
-      <string>Show group titles in name labels</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>OpenSidePanelsInFloaters</key>
-    <map>
-      <key>Comment</key>
-      <string>If true, will always open side panel contents in a floater.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AvatarInspectorTooltipDelay</key>
-    <map>
-      <key>Comment</key>
-      <string>Seconds before displaying avatar inspector tooltip</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>0.1</real>
-    </map>
-    <key>AFKTimeout</key>
-    <map>
-      <key>Comment</key>
-      <string>
-        Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never).
-        Valid values are: 0, 120, 300, 600, 1800
-      </string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <real>0</real>
-    </map>
-    <key>SLURLTeleportDirectly</key>
-    <map>
-      <key>Comment</key>
-      <string>Clicking on a slurl will teleport you directly instead of opening places panel</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>EnableClassifieds</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable creation of new classified ads</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnableGroupInfo</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable viewing and editing of group info.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnablePlaceProfile</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable viewing of place profile from web link</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnablePicks</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable editing of picks</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnableWorldMap</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable opening world map from web link</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnableAvatarPay</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable paying other avatars from web link</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnableVoiceCall</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable voice calls from web link</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>EnableAvatarShare</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable sharing from web link</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnableInventory</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable opening inventory from web link</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnableSearch</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable opening search from web link</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnableAppearance</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable opening appearance from web link</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>DoubleClickShowWorldMap</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable double-click to show world map from mini map</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>EnableGroupChatPopups</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable Incoming Group Chat Popups</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>SearchFromAddressBar</key>
-    <map>
-      <key>Comment</key>
-      <string>Can enter search queries into navigation address bar</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>DestinationGuideURL</key>
-    <map>
-      <key>Comment</key>
-      <string>Destination guide contents</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html</string>
-    </map>
-    <key>AvatarPickerURL</key>
-    <map>
-      <key>Comment</key>
-      <string>Avatar picker contents</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/avatars.html</string>
-    </map>
-    <key>LogInventoryDecline</key>
-    <map>
-      <key>Comment</key>
-      <string>Log in system chat whenever an inventory offer is declined</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>UseHTTPInventory</key>
-    <map>
-      <key>Comment</key>
-      <string>Allow use of http inventory transfers instead of UDP</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>ClickToWalk</key>
-    <map>
-      <key>Comment</key>
-      <string>Click in world to walk to location</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>ShowOfferedInventory</key>
-    <map>
-      <key>Comment</key>
-      <string>Show inventory window with last inventory offer selected when receiving inventory from other users.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>OpenIMOnVoice</key>
-    <map>
-      <key>Comment</key>
-      <string>Open the corresponding IM window when connecting to a voice call.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AllowBottomTrayButtonReordering</key>
-    <map>
-      <key>Comment</key>
-      <string>Allow user to move and hide bottom tray buttons</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>ShowHelpOnFirstLogin</key>
-    <map>
-      <key>Comment</key>
-      <string>Show Help Floater on first login</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    </map>
-</llsd>
+<llsd/>
\ No newline at end of file
diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml
new file mode 100644
index 0000000000..f2192a75ad
--- /dev/null
+++ b/indra/newview/app_settings/toolbars.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toolbars>
+  <bottom_toolbar
+    button_display_mode="icons_with_text">
+    <command name="chat"/>
+    <command name="speak"/>
+    <command name="destinations"/>
+    <command name="people"/>
+    <command name="profile"/>
+    <command name="view"/>
+    <command name="move"/>
+    <command name="howto"/>
+  </bottom_toolbar>
+  <left_toolbar
+    button_display_mode="icons_only">
+    <command name="avatar"/>
+    <command name="appearance"/>
+    <command name="inventory"/>
+    <command name="search"/>
+    <command name="places"/>
+    <command name="voice"/>
+    <command name="minimap"/>
+  </left_toolbar>
+</toolbars>