Merge branch 'DRTVWR-559' into DRTVWR-583

23 files changed, 249 insertions, 62 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_360capture.xml b/indra/newview/skins/default/xui/en/floater_360capture.xml
index c89489d145..23d054105f 100644
--- a/indra/newview/skins/default/xui/en/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/en/floater_360capture.xml
@@ -24,6 +24,7 @@
        height="16"
        layout="topleft"
        left="10"
+       name="quality_level_label"
        top="10"
        width="100">
       Quality level
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index c6776ad039..b1ed245378 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -2,13 +2,16 @@
 <floater
  positioning="cascading"
  can_tear_off="false"
- height="396"
+ can_resize="true"
  layout="topleft"
  name="floaterland"
  help_topic="floaterland"
  save_rect="true"
  title="ABOUT LAND"
- width="634">
+ height="396"
+ width="634"
+ min_height="420"
+ min_width="634">
     <floater.string
       name="maturity_icon_general">
       "Parcel_PG_Dark"
@@ -659,10 +662,11 @@
              type="string"
              length="1"
              enabled="false"
-             follows="top|left"
+             follows="top|left|right"
              height="175"
              layout="topleft"
              left="10"
+             right="-10"
              max_length="65535"
              name="covenant_editor"
              width="470"
@@ -1129,25 +1133,25 @@
   top_delta="-6"/>
             <button
              enabled="false"
-             follows="left|top"
+             follows="top|right"
              height="23"
              label="Return Objects"
              layout="topleft"
              left_pad="6"
              name="Return objects..."
              top_delta="0"
-             right="-154"
+             right="-10"
              width="164" />
             <name_list
              column_padding="0"
              draw_heading="true"
-             follows="top|left"
+             follows="all"
              height="150"
              layout="topleft"
              left="10"
              name="owner list"
              name_column="name"
-             width="470">
+             right="-10">
                 <name_list.columns
                  label="Type"
                  name="type"
@@ -1341,9 +1345,9 @@ Only large parcels can be listed in search.
           <panel
             bevel_style="none"
             border="true"
-            top="121"
-            bottom="121"
-            follows="left|bottom|right"
+            top="116"
+            bottom="116"
+            follows="left|top|right"
             left="20"
             right="-20"/>
           <check_box
@@ -1377,9 +1381,10 @@ Only large parcels can be listed in search.
              enabled="true"
              height="23"
              layout="topleft"
-             left="164"
+             left="18"
              top="194"
              name="land category"
+             follows="left|top"
              visible="true"
              width="140">
                 <combo_box.item
@@ -1508,18 +1513,18 @@ Only large parcels can be listed in search.
                 Landing Point: [LANDING]
             </text>
             <button
-             follows="right|top"
+             follows="left|top"
              top_pad="0"
              height="23"
              label="Set"
              label_selected="Set"
              layout="topleft"
              name="Set"
-             left="399"
+             left_delta="0"
              tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
              width="50" />
             <button
-             follows="right|top"
+             follows="left|top"
              height="23"
              label="Clear"
              label_selected="Clear"
@@ -1546,7 +1551,8 @@ Only large parcels can be listed in search.
              layout="topleft"
              name="landing type"
              top_pad="0"
-             left="399"
+             left_delta="0"
+             follows="left|top"
              tool_tip="Teleport Routing -- select how to handle teleports onto your land"
              width="120">
                 <combo_box.item
@@ -1590,7 +1596,8 @@ Only large parcels can be listed in search.
             <combo_box
              height="23"
              layout="topleft"
-             left_pad="144"
+             left_pad="0"
+             follows="left|top"
              name="media type"
              tool_tip="Specify if the URL is a movie, web page, or other media"
              width="120"
@@ -1599,7 +1606,7 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="16"
              layout="topleft"
-             left_pad="-134"
+             left_pad="6"
              name="mime_type"
              width="200" />
             <text
@@ -1625,11 +1632,11 @@ Only large parcels can be listed in search.
              width="300"
              top_delta="0"/>
             <button
-             follows="right|top"
+             follows="left|top"
              height="23"
              label="Set"
              layout="topleft"
-             left_pad="149"
+             left_pad="3"
              name="set_media_url"
              width="70"
              top_delta="0"/>
@@ -1985,7 +1992,8 @@ Only large parcels can be listed in search.
             <combo_box
              height="23"
              layout="topleft"
-             left_pad="166"
+             follows="left|top"
+             left_pad="22"
              name="pass_combo"
              top_delta="0"
              width="100">
@@ -2039,14 +2047,21 @@ Only large parcels can be listed in search.
              top_pad="5"
              width="400">
                 (The estate owner may have limited these choices)
-            </text>            
-            <panel
-            name="Allowed_layout_panel"
-            follows="top|left"
-            left="10"
-            height="170"
-             top_pad="8"
-            width="240">
+            </text>
+            <layout_stack name="access_stack"
+              height="170"
+              follows="all"
+              animate="false"
+              left="10"
+              right="-10"
+              top_pad="8"
+              orientation="horizontal">
+            <layout_panel
+              auto_resize="true"
+              user_resize="false"
+              name="Allowed_layout_panel"
+              height="170"
+              width="240">
             <text
              type="string"
              length="1"
@@ -2062,7 +2077,7 @@ Only large parcels can be listed in search.
             </text>
             <name_list
              column_padding="0"
-             follows="top|bottom"
+             follows="all"
              heading_height="14"
              height="125"
              layout="topleft"
@@ -2070,7 +2085,7 @@ Only large parcels can be listed in search.
              multi_select="true"
              name="AccessList"
              tool_tip="([LISTED] listed, [MAX] max)"
-             width="230" />
+             width="228" />
             <button
              follows="bottom"
              height="23"
@@ -2080,22 +2095,21 @@ Only large parcels can be listed in search.
              name="add_allowed"
              width="100" />
             <button
-             follows="bottom"
+             follows="right|bottom"
              height="23"
              label="Remove"
              label_selected="Remove"
              layout="topleft"
-             left_pad="10"
+             left_pad="28"
              name="remove_allowed"
-             right="-10"
              width="100" />
-             </panel>
-            <panel
+             </layout_panel>
+            <layout_panel
+            auto_resize="true"
+            user_resize="false"
             name="Banned_layout_panel"
-            follows="top|right"
             height="170"
-            width="240"
-            left_pad="146">
+            width="240">
             <text
              type="string"
              length="1"
@@ -2103,7 +2117,7 @@ Only large parcels can be listed in search.
              height="16"
              label="Ban"
              layout="topleft"
-             left="0"
+             left="1"
              name="BanCheck"
              top="0"
              width="200">
@@ -2111,11 +2125,11 @@ Only large parcels can be listed in search.
             </text>
             <name_list
              column_padding="0"
-             follows="top|bottom"
+             follows="all"
              heading_height="16"
              height="125"
              layout="topleft"
-             left="0"
+             left="1"
              multi_select="true"
              draw_heading="true"
              name="BannedList"
@@ -2135,21 +2149,21 @@ Only large parcels can be listed in search.
              height="23"
              label="Add"
              layout="topleft"
-             left="0"
+             left="1"
              name="add_banned"
              width="100" />
             <button
              enabled="false"
-             follows="bottom"
+             follows="right|bottom"
              height="23"
              label="Remove"
              label_selected="Remove"
              layout="topleft"
-             left_pad="10"
+             left_pad="29"
              name="remove_banned"
-             right="-10"
              width="100" />
-             </panel>
+             </layout_panel>
+          </layout_stack>
         </panel>
        <panel
           border="true"
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index aef923feb2..5258bdbaf2 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -33,6 +33,7 @@
                           animate="false"
                           orientation="horizontal">
                 <layout_panel border="false"
+                              name="lp_1"
                               bevel_style="in"
                               auto_resize="false"
                               user_resize="false"
@@ -40,6 +41,7 @@
                               width="160"
                               height="150">
                     <text follows="left|top"
+                          name="ambient_lbl"
                           height="10"
                           layout="topleft"
                           left="10"
@@ -55,6 +57,7 @@
                                   top_pad="5"
                                   width="60"/>
                     <text follows="left|top"
+                          name="blue_horizon_lbl"
                           height="10"
                           layout="topleft"
                           left_delta="0"
@@ -70,6 +73,7 @@
                                   top_pad="5"
                                   width="60"/>
                     <text follows="left|top"
+                          name="blue_density_lbl"
                           height="10"
                           layout="topleft"
                           left_delta="0"
@@ -95,6 +99,7 @@
                       top_pad="10"
                       width="100"/>
                     <text follows="right|top"
+                          name="sun_color_lbl"
                           height="10"
                           layout="topleft"
                           right="-12"
@@ -110,6 +115,7 @@
                                   top_pad="5"
                                   width="60"/>
                     <text follows="left|top"
+                          name="cloud_color_lbl"
                           height="10"
                           layout="topleft"
                           left_delta="0"
@@ -142,7 +148,7 @@
                           layout="topleft"
                           left_delta="0"
                           top_pad="-13"
-                          name="cloud_map_label"
+                          name="water_map_label"
                           width="80">Water Image:</text>
                     <texture_picker height="63"
                                     layout="topleft"
@@ -152,6 +158,7 @@
                                     width="60"/>
                 </layout_panel>
                 <layout_panel border="false"
+                              name="lp_2"
                               bevel_style="in"
                               auto_resize="false"
                               user_resize="false"
@@ -159,6 +166,7 @@
                               width="200"
                               height="150">
                     <text follows="left|top"
+                          name="haze_horizon_label"
                           height="10"
                           layout="topleft"
                           left_delta="5"
@@ -178,6 +186,7 @@
                             width="185"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="haze_density_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -197,6 +206,7 @@
                             width="185"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="cloud_coverage_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -216,6 +226,7 @@
                             width="185"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="cloud_scale_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -235,6 +246,7 @@
                             width="185"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="scene_gamma_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -273,6 +285,7 @@
                           can_edit_text="true"/>
                 </layout_panel>
                 <layout_panel border="false"
+                              name="lp_3"
                               bevel_style="in"
                               auto_resize="false"
                               user_resize="false"
@@ -296,6 +309,7 @@
                                         width="150"
                                         thumb_mode="sun"/>
                   <text follows="left|top"
+                        name="sun_azimuth_label"
                         height="10"
                         layout="topleft"
                         left_delta="0"
@@ -315,6 +329,7 @@
                           width="130"
                           can_edit_text="true"/>
                   <text follows="left|top"
+                        name="sun_elevation_label"
                         height="10"
                         layout="topleft"
                         left_delta="-5"
@@ -343,6 +358,7 @@
                                top_pad="8"
                                follows="left|top"/>
                     <text follows="left|top"
+                          name="scale_label"
                           height="10"
                           layout="topleft"
                           left_pad="95"
@@ -362,6 +378,7 @@
                             width="130"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="glow_focus_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -381,6 +398,7 @@
                             width="130"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="glow_size_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -400,6 +418,7 @@
                             width="130"
                             can_edit_text="true"/>
                     <text follows="left|top"
+                          name="star_brightness_label"
                           height="10"
                           layout="topleft"
                           left_delta="-5"
@@ -420,6 +439,7 @@
                             can_edit_text="true"/>
                 </layout_panel>
                 <layout_panel border="false"
+                              name="lp_4"
                               bevel_style="in"
                               auto_resize="false"
                               user_resize="false"
@@ -443,6 +463,7 @@
                                         width="150"
                                         thumb_mode="moon"/>
                   <text follows="left|top"
+                        name="moon_azimuth_label"
                         height="10"
                         layout="topleft"
                         left_delta="0"
@@ -462,6 +483,7 @@
                           width="130"
                           can_edit_text="true"/>
                   <text follows="left|top"
+                        name="moon_elevation_label"
                         height="10"
                         layout="topleft"
                         left_delta="-5"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 31c524c38a..f3d7c38a76 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -270,6 +270,7 @@
                                 word_wrap="true"/>
 
                         <layout_stack
+                                name="track_options_ls"
                                 follows="all"
                                 height="200"
                                 animate="false"
@@ -277,6 +278,7 @@
                                 left="0"
                                 orientation="horizontal">
                             <layout_panel
+                                    name="track_options_lp"
                                     border="false"
                                     bevel_style="in"
                                     auto_resize="false"
@@ -312,6 +314,7 @@
                                     
                             </layout_panel>
                             <layout_panel
+                                    name="track_progress_lp"
                                     border="false"
                                     bevel_style="in"
                                     auto_resize="false"
@@ -457,6 +460,7 @@
                                 </layout_stack>
                             </layout_panel>
                             <layout_panel
+                                    name="frames_lp"
                                     border="false"
                                     bevel_style="in"
                                     auto_resize="false"
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
index f275fec066..588aca38e6 100644
--- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 
 <floater
+  name="experience_profile"
   positioning="cascading"
   can_close="true"
   enabled="true"
@@ -88,6 +89,7 @@
             animate="false"
             top="0"
             orientation="vertical"
+            name="ls1"
             width="315">
             <layout_panel
               follows="all"
@@ -264,6 +266,7 @@
               auto_resize="false"
               name="marketplace panel">
               <text
+                name="Marketplace"
                 type="string"
                 length="1"
                 follows="left|top"
@@ -287,6 +290,7 @@
               </text>
             </layout_panel>
             <layout_panel
+              name="owner panel"
               follows="left|top|right"
               height="18"
               left="0"
@@ -613,6 +617,7 @@
             name="clear_btn"
             label="Clear Location"/>
           <text
+            name="edit_marketplace"
             type="string"
             length="1"
             follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
index a6e20880a9..45f3880a15 100644
--- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
+++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml
@@ -34,6 +34,7 @@
                     left_delta="10"
                     width="35"
                     height="20"
+                    name="info_panel_label"
                     font="SansSerif">
                 Name:
             </text>
diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml
index db81c8bba2..8c9c450d7c 100644
--- a/indra/newview/skins/default/xui/en/floater_my_environments.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml
@@ -17,6 +17,7 @@
         min_width="265"
         width="313">
     <layout_stack 
+            name="main_layout"
             follows="all"
             layout="topleft"
             left="5"
@@ -126,6 +127,7 @@
                 auto_resize="false"
                 user_resize="false"
                 tab_group="1"
+                name="lp_showfolders"
                 height="15">
             <check_box
                     follows="left|bottom"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index df067d2b88..7a29d68a4c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2924,16 +2924,6 @@ function="World.EnvPreset"
            parameter="triangle count" />
         </menu_item_check>
         <menu_item_check
-         label="Build Queue"
-         name="Build Queue">
-          <menu_item_check.on_check
-           function="Advanced.CheckInfoDisplay"
-           parameter="build queue" />
-          <menu_item_check.on_click
-           function="Advanced.ToggleInfoDisplay"
-           parameter="build queue" />
-        </menu_item_check>
-        <menu_item_check
          label="Lights"
          name="Lights">
           <menu_item_check.on_check
@@ -3269,7 +3259,24 @@ function="World.EnvPreset"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
           <menu_item_separator />
-          
+          <menu_item_check
+             label="Enable Shader Cache"
+             name="Enable Shader Cache">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="RenderShaderCacheEnabled" />
+            <menu_item_check.on_click
+             function="ToggleShaderControl"
+             parameter="RenderShaderCacheEnabled" />
+          </menu_item_check>
+          <menu_item_call
+            enabled="true"
+            label="Clear Shader Cache"
+            name="Shader Cache Clear">
+            <menu_item_call.on_click
+             function="Advanced.ClearShaderCache" />
+          </menu_item_call>
+          <menu_item_separator />
           <menu_item_call
             enabled="true"
             label="Clear Cache Immediately"
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index de9ac4247f..a9d99dad27 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -309,6 +309,17 @@
 			media_plugin_cef
 		</impl>
 	</mimetype>
+    <mimetype name="application/octet-stream">
+        <label name="application/octet-stream_label">
+            Stream
+        </label>
+        <widgettype>
+            movie
+        </widgettype>
+        <impl>
+            media_plugin_libvlc
+        </impl>
+    </mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
 			Audio (MIDI)
@@ -474,6 +485,17 @@
 			media_plugin_libvlc
 		</impl>
 	</mimetype>
+    <mimetype name="video/x-flv">
+        <label name="video/x-flv_label">
+            Movie (flv)
+        </label>
+        <widgettype>
+            movie
+        </widgettype>
+        <impl>
+            media_plugin_libvlc
+        </impl>
+    </mimetype>
   <mimetype name="application/octet-stream">
     <label name="video/octet-stream">
       Movie
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
index 2d96708b86..7fa0a676dd 100644
--- a/indra/newview/skins/default/xui/en/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml
@@ -287,6 +287,17 @@
 			media_plugin_cef
 		</impl>
 	</mimetype>
+    <mimetype name="application/octet-stream">
+        <label name="application/octet-stream_label">
+            Stream
+        </label>
+        <widgettype>
+            movie
+        </widgettype>
+        <impl>
+            media_plugin_libvlc
+        </impl>
+    </mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
 			Audio (MIDI)
@@ -452,6 +463,17 @@
 			media_plugin_libvlc
 		</impl>
 	</mimetype>
+    <mimetype name="video/x-flv">
+        <label name="video/x-flv_label">
+            Movie (flv)
+        </label>
+        <widgettype>
+            movie
+        </widgettype>
+        <impl>
+            media_plugin_libvlc
+        </impl>
+    </mimetype>
 	<mimetype menu="1" name="video/quicktime">
 		<label name="video/quicktime_label">
 			Movie (QuickTime)
diff --git a/indra/newview/skins/default/xui/en/panel_experience_info.xml b/indra/newview/skins/default/xui/en/panel_experience_info.xml
index 70d8a4fc64..5b6dab3ac6 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_info.xml
@@ -44,6 +44,7 @@
       width="315"
       min_width="315">
       <layout_stack
+        name="ls1"
         follows="all"
         height="480"
         layout="topleft"
@@ -73,6 +74,7 @@
             width="290" />
         </layout_panel>
         <layout_panel
+          name="title panel"
           follows="all"
           height="19"
           layout="topleft"
@@ -203,6 +205,7 @@
           </text>
         </layout_panel>
         <layout_panel
+          name="details panel"
           follows="left|top|right"
           height="69"
           left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
index a9777c51e7..58c18b8bb1 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_list_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <panel
+  name="panel_experience_list_item"
   layout="topleft"
   top="100"
   left="5"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_log.xml b/indra/newview/skins/default/xui/en/panel_experience_log.xml
index 6869a135d8..bf7295b187 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_log.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <panel
+  name="panel_experience_log"
   layout="topleft"
   top="3"
   left="3"
@@ -16,6 +17,7 @@
     name="loading"
     value="loading..."/>
   <layout_stack
+    name="ls1"
     layout="topleft"
     top="0"
     left="4" 
@@ -24,6 +26,7 @@
     orientation="vertical"
     follows="all">
     <layout_panel
+      name="list panel"
       layout="topleft"
       top="0"
       left="1"
diff --git a/indra/newview/skins/default/xui/en/panel_experience_search.xml b/indra/newview/skins/default/xui/en/panel_experience_search.xml
index 99ad3e7fe3..c2fe9fb085 100644
--- a/indra/newview/skins/default/xui/en/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/en/panel_experience_search.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
+  name="panel_experience_search"
   layout="topleft"
   top="18"
   left="0"
@@ -44,6 +45,7 @@
     top="0"
     name="search_panel">
     <text
+      name="lbl name part"
       left="0"
       follows="top|left|right"
       right="-1">
@@ -63,6 +65,7 @@
             height="18"
             name="find"/>
     <text
+      name="lbl max content rating"
       top_pad="6"
       left="0"
       follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_experiences.xml b/indra/newview/skins/default/xui/en/panel_experiences.xml
index 7691e684c0..9d30615442 100644
--- a/indra/newview/skins/default/xui/en/panel_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_experiences.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 
 <panel
+  name="panel_experiences"
   layout="topleft"
   top="3"
   left="3"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 35bd736d77..f4181b2152 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -67,7 +67,7 @@
 
     <text
         layout="topleft"
-        left="345"
+        left="389"
         height="12"
         name="font_size"
         width="120"
@@ -79,7 +79,7 @@
         control_name="ChatFontSize"
         height="23"
         layout="topleft"
-        left="341"
+        left="385"
         name="chat_font_size"
         top_pad="5"
         width="100">
@@ -103,7 +103,7 @@
         label="Bubble Chat"
         layout="topleft"
         top_pad="4"
-        left_delta="0"
+        left="340"
         name="bubble_text_chat"
         width="330">
     </check_box>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index e90e6caf84..58d125a88e 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -8,6 +8,7 @@
         name="panel_settings_sky_atmos"
         top="0">
     <layout_stack
+            name="main_ls"
             follows="all"
             layout="topleft"
             left="5"
@@ -16,6 +17,7 @@
             bottom="-5"
             orientation="vertical">
         <layout_panel
+                name="top_lp"
                 border="true"
                 bevel_style="in"
                 auto_resize="false"
@@ -24,6 +26,7 @@
                 height="75">
 
             <text
+                    name="ambient_color_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -43,6 +46,7 @@
                     top_pad="5"
                     width="60" />
             <text
+                    name="blue_horizon_label"
                     follows="left"
                     height="10"
                     layout="topleft"
@@ -62,6 +66,7 @@
                     top_pad="5"
                     width="60" />
             <text
+                    name="blue_density_label"
                     follows="left"
                     height="10"
                     layout="topleft"
@@ -82,6 +87,7 @@
                     width="60" />
         </layout_panel>
         <layout_panel
+                name="bottom_lp"
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
@@ -95,6 +101,7 @@
                     follows="left|top|right|bottom"
                     orientation="hoizontal">
                 <layout_panel
+                        name="left_lp"
                         border="false"
                         bevel_style="in"
                         auto_resize="true"
@@ -102,6 +109,7 @@
                         visible="true"
                         min_width="225">
                     <text
+                            name="haze_horizon_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -125,6 +133,7 @@
                             width="207"
                             can_edit_text="true"/>
                     <text
+                            name="haze_density_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -148,6 +157,7 @@
                             width="207"
                             can_edit_text="true"/>
                     <text
+                            name="moisture_level_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -171,6 +181,7 @@
                             width="207"
                             can_edit_text="true"/>
                     <text
+                            name="droplet_radius_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -194,6 +205,7 @@
                             width="207"
                             can_edit_text="true"/>
                     <text
+                            name="ice_level_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -217,6 +229,7 @@
                             width="207"
                             can_edit_text="true"/>
                     <text
+                            name="scene_gamma_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -240,6 +253,7 @@
                             can_edit_text="true"/>
                 </layout_panel>            
                 <layout_panel
+                        name="right_lp"
                         border="false"
                         bevel_style="in"
                         auto_resize="true"
@@ -247,6 +261,7 @@
                         visible="true"
                         min_width="225">
                     <text
+                            name="density_multiplier_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -270,6 +285,7 @@
                             width="219"
                             can_edit_text="true"/>
                     <text
+                            name="distance_multiplier_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -293,6 +309,7 @@
                             width="219"
                             can_edit_text="true"/>
                     <text
+                            name="maximum_altitude_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index ac3b45d24c..9bdfa94a33 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -9,6 +9,7 @@
         name="panel_settings_sky_clouds"
         top="0">
     <layout_stack 
+            name="main_ls"
             follows="all"
             layout="topleft"
             left="5"
@@ -17,6 +18,7 @@
             bottom="-5"
             orientation="hoizontal">
         <layout_panel
+                name="left_lp"
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
@@ -24,6 +26,7 @@
                 visible="true"
                 height="75">
             <text
+                    name="cloud_color_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -43,6 +46,7 @@
                     top_pad="5"
                     width="60" />
             <text
+                    name="cloud_coverage_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -66,6 +70,7 @@
                     width="214"
                     can_edit_text="true"/>
             <text
+                    name="cloud_scale_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -89,6 +94,7 @@
                     width="214"
                     can_edit_text="true"/>
             <text
+                    name="cloud_variance_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -112,6 +118,7 @@
                     width="214"
                     can_edit_text="true"/>
             <text
+                    name="cloud_scroll_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -135,6 +142,7 @@
                     logarithmic="1"/>
 
             <text
+                    name="cloud_image_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -152,6 +160,7 @@
                     width="100"/>
         </layout_panel>
         <layout_panel
+                name="right_lp"
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
@@ -159,6 +168,7 @@
                 visible="true"
                 height="75">
             <text
+                    name="cloud_density_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -213,6 +223,7 @@
                     width="200"
                     can_edit_text="true"/>
             <text
+                    name="cloud_detail_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index b3a33961bc..9b37896979 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -9,6 +9,7 @@
         name="panel_settings_sky_density"
         top="0">
     <layout_stack 
+            name="main_ls"
             follows="all"
             layout="topleft"
             left="5"
@@ -17,6 +18,7 @@
             bottom="-5"
             orientation="vertical">
         <layout_panel
+                name="lp_1"
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
@@ -96,6 +98,7 @@
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
+                name="lp_2"
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
@@ -190,6 +193,7 @@
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
+                name="lp_3"
                 border="true"
                 bevel_style="in"
                 auto_resize="true"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 1ad78dbb13..35adb262bb 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -8,6 +8,7 @@
         name="panel_settings_sky_hbodies"
         top="0">
     <layout_stack 
+            name="main_ls"
             follows="all"
             layout="topleft"
             left="5"
@@ -24,6 +25,7 @@
                 name="sun_layout"
                 height="400">
             <text
+                    name="sun_stars_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -34,6 +36,7 @@
                 Sun &amp; Stars
             </text>
             <text
+                    name="position_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -51,6 +54,7 @@
                     width="150"
                     thumb_mode="sun" />
             <text
+                    name="image_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -67,6 +71,7 @@
                     top_pad="10"
                     width="100"/>
             <text
+                    name="scale_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -90,6 +95,7 @@
                     width="130"
                     can_edit_text="true"/>
             <text
+                    name="color_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -110,6 +116,7 @@
                     width="60" />
           <text
             follows="left|top"
+            name="sun_azimuth_label"
             height="10"
             layout="topleft"
             left_delta="-235"
@@ -133,6 +140,7 @@
             can_edit_text="true"/>
           <text
             follows="left|top"
+            name="sun_elevation_label"
             height="10"
             layout="topleft"
             left_delta="-5"
@@ -155,6 +163,7 @@
             width="215"
             can_edit_text="true"/>
             <text
+                    name="glow_focus_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -178,6 +187,7 @@
                     width="215"
                     can_edit_text="true"/>
             <text
+                    name="glow_size_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -201,6 +211,7 @@
                     width="215"
                     can_edit_text="true"/>
             <text
+                    name="star_brightness_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
@@ -237,6 +248,7 @@
                     
         </layout_panel>
         <layout_panel
+                name="moon_layout"
                 border="false"
                 bevel_style="in"
                 auto_resize="true"
@@ -244,6 +256,7 @@
                 visible="true"
                 height="400">
             <layout_stack 
+                    name="moon_stack"
                     left="5"
                     top="5"
                     right="-5"
@@ -259,6 +272,7 @@
                         name="moon_layout"
                         height="220">
                     <text
+                            name="moon_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -269,6 +283,7 @@
                         Moon
                     </text>
                     <text
+                            name="position_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -286,6 +301,7 @@
                             width="150"
                             thumb_mode="moon" />
                     <text
+                            name="moon_image_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -302,6 +318,7 @@
                             top_pad="10"
                             width="100"/>
                     <text
+                            name="scale_label"
                             follows="left|top"
                             height="10"
                             layout="topleft"
@@ -326,6 +343,7 @@
                             can_edit_text="true"/>
                   <text
                     follows="left|top"
+                    name="moon_azimuth_label"
                     height="10"
                     layout="topleft"
                     left_delta="-170"
@@ -349,6 +367,7 @@
                     can_edit_text="true"/>
                   <text
                     follows="left|top"
+                    name="moon_elevation_label"
                     height="10"
                     layout="topleft"
                     left_delta="-5"
@@ -371,6 +390,7 @@
                     width="215"
                     can_edit_text="true"/>
                   <text
+                    name="brightness_label"
                     follows="left|top"
                     height="10"
                     layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 991ce25bec..1aa42af3a8 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -17,6 +17,7 @@
             bottom="-5"
             orientation="vertical">
         <layout_panel
+                name="lp_top"
                 border="true"
                 bevel_style="in"
                 auto_resize="false"
@@ -24,6 +25,7 @@
                 visible="true"
                 height="105">
             <text
+                    name="water_fog_label"
                     follows="left|top"
                     height="20"
                     font="SansSerif"
@@ -34,6 +36,7 @@
                 Water Fog:
             </text>
             <text
+                    name="color_label"
                     follows="left|top"
                     height="10"
                     layout="left|top"
@@ -53,6 +56,7 @@
                     top_pad="5"
                     width="60" />
             <text
+                    name="density_exponent_label"
                     follows="left|top"
                     height="10"
                     top_delta="-15"
@@ -75,6 +79,7 @@
                     width="150"
                     can_edit_text="true"/>
             <text
+                    name="underwater_modifier_label"
                     follows="left|top"
                     height="10"
                     top_delta="25"
@@ -101,6 +106,7 @@
                             height="10"
                             layout="topleft"
                             left_delta="165"
+                            name="FresnelScaleText"
                             top_delta="-53"
                             width="150">
                         Fresnel Scale:
@@ -141,6 +147,7 @@
                     
         </layout_panel>
         <layout_panel
+                name="lp_bottom"
                 auto_resize="true"
                 user_resize="false"
                 visible="true">
@@ -152,6 +159,7 @@
                     follows="left|top|right|bottom"
                     orientation="horizontal">
                 <layout_panel
+                        name="lp_left"
                         border="true"
                         bevel_style="in"
                         auto_resize="true"
@@ -160,6 +168,7 @@
                         min_width="460"
                         width="50">
                     <text
+                            name="normal_map_label"
                             follows="left|top|right"
                             height="16"
                             layout="topleft"
@@ -177,6 +186,7 @@
                             width="61"/>
 
                     <text
+                            name="large_wave_speed_label"
                             follows="left|top"
                             height="16"
                             width="120"
@@ -202,6 +212,7 @@
                         arrow_color="white"/>
                     
                     <text
+                            name="small_wave_speed_label"
                             follows="left|top"
                             height="16"
                             layout="topleft"
@@ -226,6 +237,7 @@
                         arrow_color="white"/>
 
                     <text
+                            name="reflection_wavelet_scale_label"
                             follows="left|top|right"
                             height="16"
                             layout="topleft"
@@ -277,6 +289,7 @@
                         
                 </layout_panel>
                 <layout_panel
+                        name="lp_right"
                         border="true"
                         bevel_style="in"
                         auto_resize="true"
@@ -284,6 +297,7 @@
                         width="50"
                         visible="true">
                     <text
+                            name="refraction_and_blur_label"
                             follows="left|top"
                             height="20"
                             font="SansSerif"
@@ -294,6 +308,7 @@
                         Refraction And Blur:
                     </text>
                     <text
+                            name="refraction_scale_above_label"
                             follows="left|top|right"
                             height="16"
                             layout="topleft"
@@ -318,6 +333,7 @@
                             width="200"
                             can_edit_text="true" />
                     <text
+                            name="refraction_scale_below_label"
                             type="string"
                             length="1"
                             follows="left|top|right"
@@ -344,6 +360,7 @@
                             width="200"
                             can_edit_text="true"/>
                     <text
+                            name="blur_multiplier_label"
                             follows="left|top|right"
                             font="SansSerif"
                             height="16"
diff --git a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
index 0f3f0159db..eb665fd3cb 100644
--- a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
@@ -13,6 +13,7 @@
      follows="left|top"
      height="11"
      layout="topleft"
+     name="exponential_term_label"
      left="15"
      top_pad="-5"
      width="120">
@@ -45,6 +46,7 @@ Exponential Term
      follows="left|top"
      height="11"
      layout="topleft"
+     name="exponential_scale_factor_label"
      left="15"
      top_pad="-5"
      width="120">
@@ -69,6 +71,7 @@ Exponential Scale Factor
      follows="left|top"
      height="11"
      layout="topleft"
+     name="linear_term_label"
      left="15"
      top_pad="-5"
      width="120">
@@ -93,6 +96,7 @@ Linear Term
      follows="left|top"
      height="11"
      layout="topleft"
+     name="constant_term_label"
      left="15"
      top_pad="-5"
      width="120">
@@ -117,6 +121,7 @@ Constant Term
      follows="left|top"
      height="11"
      layout="topleft"
+     name="max_altitude_label"
      left="15"
      top_pad="15"
      width="80">
diff --git a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
index cd84b91b1f..866276f997 100644
--- a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
@@ -41,6 +41,7 @@
     width="359" />
     <add_btn
      name="add_wearable"
+     visible="false"
      layout="topleft"
      follows="top|right"
      image_unselected="Add_Icon"
@@ -52,6 +53,7 @@
      tab_stop="false" />
     <remove_btn
      name="remove_wearable"
+     visible="false"
      layout="topleft"
      follows="top|right"
      image_unselected="Remove_Icon"