Automated merge from trunk

23 files changed, 670 insertions, 527 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 1b8bbe42d2..b45e39a111 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -27,6 +27,22 @@
      name="move_tooltip">
         Move Camera Up and Down, Left and Right
     </floater.string>
+    <floater.string
+     name="orbit_mode_title">
+        Orbit
+    </floater.string>
+    <floater.string
+     name="pan_mode_title">
+        Pan
+    </floater.string>
+    <floater.string
+     name="avatar_view_mode_title">
+        Presets
+    </floater.string>
+    <floater.string
+     name="free_mode_title">
+        View Object
+    </floater.string>
     <panel
      border="false"
      height="110"
@@ -132,6 +148,7 @@
              height="40"
              image_selected="Cam_Preset_Back_On"
              image_unselected="Cam_Preset_Back_Off"
+             is_toggle="true"
              layout="topleft"
              left="0"
              name="rear_view"
@@ -146,6 +163,7 @@
              height="40"
              image_selected="Cam_Preset_Side_On"
              image_unselected="Cam_Preset_Side_Off"
+             is_toggle="true"
              layout="topleft"
              left_pad="5"
              name="group_view"
@@ -160,6 +178,7 @@
              height="40"
              image_selected="Cam_Preset_Front_On"
              image_unselected="Cam_Preset_Front_Off"
+             is_toggle="true"
              layout="topleft"
              left="0"
              name="front_view"
@@ -174,6 +193,7 @@
              height="40"
              image_selected="Cam_Preset_Eye_Off"
              image_unselected="Cam_Preset_Eye_Off"
+             is_toggle="true"
              layout="topleft"
              left_pad="5"
              name="mouselook_view"
@@ -228,7 +248,7 @@
          image_selected="PushButton_Selected_Press"
          name="avatarview_btn"
          tab_stop="false"
-         tool_tip="See as avatar"
+         tool_tip="Presets"
          width="25">
         </button>
         <button
diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml
index 8c87bd42dd..14f9e2db95 100644
--- a/indra/newview/skins/default/xui/en/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml
@@ -135,28 +135,28 @@
      width="210" />
     <button
      follows="left|top"
-     height="20"
+     height="23"
      label="Use Estate Time"
      layout="topleft"
-     left="8"
+     left="10"
      name="EnvUseEstateTimeButton"
      top="120"
      width="137" />
     <button
      follows="left|top"
-     height="20"
+     height="23"
      label="Advanced Sky"
      layout="topleft"
-     left_pad="9"
+     left_pad="3"
      name="EnvAdvancedSkyButton"
      top_delta="0"
      width="137" />
     <button
      follows="left|top"
-     height="20"
+     height="23"
      label="Advanced Water"
      layout="topleft"
-     left_pad="9"
+     left_pad="3"
      name="EnvAdvancedWaterButton"
      top_delta="0"
      width="137" />
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index 50f0f0454c..bcf15d7193 100644
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
@@ -20,6 +20,22 @@
    name="dont_notify">
     Don&apos;t Notify
   </floater.string>
+  <floater.string
+   name="moderate">
+    Moderate
+  </floater.string>
+  <floater.string
+   name="adult">
+    Adult
+  </floater.string>
+  <floater.string
+   name="general">
+    General
+  </floater.string>
+  <floater.string
+   name="unknown">
+    Unknown
+  </floater.string>
   <layout_stack
     name="layout"
     orientation="vertical"
@@ -32,7 +48,7 @@
     border_size="0">
     <layout_panel
        name="profile_stack"
-       follows="all"
+       follows="top|left"
        layout="topleft"
        top="0"
        left="0"
@@ -72,7 +88,7 @@
        left="10"
        top_pad="7"
        name="event_runby_label"
-       width="310">
+       width="90">
         Run by:
       </text>
       <text
@@ -80,48 +96,79 @@
         height="20"
         initial_value="(retrieving)"
         layout="topleft"
-        left="10"
+        left_pad="0"
         link="true"
         name="event_runby"
-        top_pad="2"
+        top_delta="0"
         use_ellipses="true"
-        width="310" />
+        width="240" />
+      <text
+       type="string"
+       length="1"
+       follows="top|left"
+       layout="topleft"
+       left="10"
+       top_pad="5"
+       name="event_date_label"
+       width="90">
+        Date:
+      </text>
       <text
      type="string"
      length="1"
-     left="10"
+     left_pad="0"
      height="17"
-     font="SansSerifMedium"
-    text_color="EmphasisColor"
-     top_pad="5"
+     top_delta="0"
      follows="top|left"
      layout="topleft"
      name="event_date"
-     width="310">
+     width="240">
         10/10/2010
       </text>
       <text
        type="string"
-       height="14"
        length="1"
+       follows="top|left"
+       layout="topleft"
        left="10"
+       top_pad="5"
+       name="event_duration_label"
+       width="90">
+        Duration:
+      </text>
+      <text
+       type="string"
+       height="14"
+       length="1"
+       left_pad="0"
        follows="top|left"
        layout="topleft"
        name="event_duration"
-       width="310">
+       top_delta="0"
+       width="240">
         1 hour
       </text>
       <text
-       font="SansSerifMedium"
-       text_color="EmphasisColor"
+       type="string"
+       length="1"
+       follows="top|left"
+       layout="topleft"
+       left="10"
+       top_pad="5"
+       name="event_covercharge_label"
+       width="90">
+        Cover charge:
+      </text>
+      <text
         type="string"
         follows="left|top"
         height="16"
         layout="topleft"
-       left="10"
+       left_pad="0"
        name="event_cover"
         visible="true"
-        width="310">
+        width="240"
+        top_delta="0">
         Free
       </text>
       <text
@@ -131,28 +178,48 @@
        layout="topleft"
        left="10"
        top_pad="5"
-       name="event_location_label">
+       name="event_location_label"
+       width="90">
         Location:
       </text>
       <text
        type="string"
        length="1"
        height="20"
-       left="10"
+       left_pad="0"
        follows="top|left"
        layout="topleft"
        name="event_location"
        use_ellipses="true"
+       top_delta="0"
        value="SampleParcel, Name Long (145, 228, 26)"
-        width="310" />
+       width="240" />
       <icon
-   follows="top|left"
-   height="16"
-   image_name="Parcel_PG_Dark"
-   layout="topleft"
-   left="10"
-   name="rating_icon"
-   width="18" />
+       follows="top|left"
+       height="16"
+       image_name="Parcel_PG_Dark"
+       layout="topleft"
+       left="10"
+       name="rating_icon_pg"
+       width="18" />
+      <icon
+       follows="top|left"
+       height="16"
+       image_name="Parcel_M_Dark"
+       layout="topleft"
+       left="10"
+       name="rating_icon_m"
+       top_delta="0"
+       width="18" />
+      <icon
+       follows="top|left"
+       height="16"
+       image_name="Parcel_R_Dark"
+       layout="topleft"
+       left="10"
+       name="rating_icon_r"
+       top_delta="0"
+       width="18" />
       <text
        follows="left|top"
        height="16"
@@ -161,33 +228,34 @@
        name="rating_label"
        top_delta="3"
        value="Rating:"
-       width="60" />
+       width="58" />
       <text
        follows="left|right|top"
        height="16"
        layout="topleft"
-       left_pad="0"
+       left_pad="2"
        name="rating_value"
        top_delta="0"
        value="unknown"
-       width="200" />
+       width="240" />
       <expandable_text
-               follows="left|top|right"
-               height="106"
-               layout="topleft"
-               left="6"
-               name="event_desc"
-               width="313" />
+       follows="left|top|right"
+       height="65"
+       layout="topleft"
+       left="6"
+       name="event_desc"
+       width="322">
+       Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</expandable_text>
     </layout_panel>
     <layout_panel
-               follows="left|right"
-               height="24"
-               layout="topleft"
-               mouse_opaque="false"
-               name="button_panel"
-               top="0"
-               left="0"
-               user_resize="false">
+       follows="left|right"
+       height="24"
+       layout="topleft"
+       mouse_opaque="false"
+       name="button_panel"
+       top="0"
+       left="0"
+       user_resize="false">
       <button
        follows="left|top"
            height="18"
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 65a05f3ec5..0f098bbb52 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -22,9 +22,7 @@
      tab_width="64"
      tab_max_width = "134"
      tab_height="16"
-     use_custom_icon_ctrl="true"
-     tab_icon_ctrl_pad="2"
-     halign="left"
+     halign="center"
      use_ellipses="true"
      top="0"
      width="390" />
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 0a5820ce73..8e2c57764b 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -38,6 +38,18 @@
      name="fly_back_tooltip">
         Fly Backwards (press Down Arrow or S)
     </string>
+    <string
+     name="walk_title">
+        Walk
+    </string>
+    <string
+     name="run_title">
+        Run
+    </string>
+    <string
+     name="fly_title">
+        Fly
+    </string>
     <panel
      border="false"
      height="83"
@@ -179,16 +191,5 @@
          tool_tip="Flying mode"
          top="2"
          width="31" />
-        <button
-         visible="false"
-         follows="left|bottom"
-         height="20"
-         label="Stop Flying"
-         layout="topleft"
-         left="0"
-         name="stop_fly_btn"
-         tool_tip="Stop flying"
-         top="2"
-         width="115" />
     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d989282b9f..4e59a9b1ca 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  follows="left|top|right"
- height="570"
+ height="580"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -737,7 +737,7 @@
     </text>
     <tab_container
      follows="left|top"
-     height="400"
+     height="410"
      halign="center"
      left="0"
      name="Object Info Tabs"
@@ -1054,7 +1054,7 @@ even though the user gets a free copy.
          name="perms_build"
          left="0"
          top="241"
-         height="120"
+         height="130"
          width="278">
             <text
              type="string"
@@ -1135,7 +1135,7 @@ even though the user gets a free copy.
              left="10"
              name="B:"
              height="10"
-             width="45">
+             width="80">
                 B:
             </text>
             <text
@@ -1147,7 +1147,7 @@ even though the user gets a free copy.
              left_pad="0"
              name="O:"
              height="10"
-             width="44">
+             width="80">
                 O:
             </text>
             <text
@@ -1159,7 +1159,7 @@ even though the user gets a free copy.
              left_pad="0"
              name="G:"
              height="10"
-             width="43">
+             width="80">
                 G:
             </text>
             <text
@@ -1167,11 +1167,12 @@ even though the user gets a free copy.
              text_color="White"
              length="1"
              follows="left|top"
-             left_pad="0"
+             left="10"
+             top_pad="2"
              layout="topleft"
              name="E:"
              height="10"
-             width="43">
+             width="80">
                 E:
             </text>
             <text
@@ -1183,7 +1184,7 @@ even though the user gets a free copy.
              left_pad="0"
              name="N:"
              height="10"
-             width="48">
+             width="80">
                 N:
             </text>
             <text
@@ -1195,7 +1196,7 @@ even though the user gets a free copy.
              left_pad="0"
              name="F:"
              height="10"
-             width="50">
+             width="80">
                 F:
             </text>
         </panel>
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index e86cb23c1e..3a981adfdf 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -112,7 +112,7 @@
          layout="topleft"
          left_pad="15"
          name="toggle_overlap_panel"
-         tool_tip="Toggle highlighting and display panel for overlapping elements; right click an element to select it for this feature.  The selected element is marked by a red rectangle."
+         tool_tip="Toggle highlighting and display panel for overlapping elements; right-click an element to select it for this feature.  The selected element is marked by a red rectangle."
          top_delta="0"
          width="30" />
         <text
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index c4411db8c5..114b9a84e3 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -70,7 +70,7 @@
              text_color="white"
              top="4"
              use_ellipses="true"
-             value="Mya Avatar:"
+             value="My Avatar:"
              width="210" />
             <output_monitor
              auto_update="true"
diff --git a/indra/newview/skins/default/xui/en/floater_water.xml b/indra/newview/skins/default/xui/en/floater_water.xml
index 32739ac953..3a44ba3763 100644
--- a/indra/newview/skins/default/xui/en/floater_water.xml
+++ b/indra/newview/skins/default/xui/en/floater_water.xml
@@ -16,49 +16,49 @@
      type="string"
      length="1"
      follows="left|top|right"
-     font.style="BOLD"
      height="16"
      layout="topleft"
      left="10"
      name="KeyFramePresetsText"
      top="34"
-     width="110">
+     font="SansSerif"
+     width="85">
         Water Presets:
     </text>
     <combo_box
-     height="18"
+     height="23"
      layout="topleft"
-     left_pad="10"
+     left_delta="95"
      name="WaterPresetsCombo"
-     top_delta="-2"
+     top_delta="-4"
      width="150" />
     <button
-     height="20"
+     height="23"
      label="New"
      label_selected="New"
      layout="topleft"
-     left_pad="20"
+     left_pad="3"
      name="WaterNewPreset"
-     top_delta="1"
-     width="90" />
+     top_delta="0"
+     width="70" />
     <button
-     height="20"
+     height="23"
      label="Save"
      label_selected="Save"
      layout="topleft"
-     left_pad="10"
+     left_pad="3"
      name="WaterSavePreset"
      top_delta="0"
-     width="90" />
+     width="70" />
     <button
-     height="20"
+     height="23"
      label="Delete"
      label_selected="Delete"
      layout="topleft"
-     left_pad="10"
+     left_pad="3"
      name="WaterDeletePreset"
      top_delta="0"
-     width="90" />
+     width="70" />
     <tab_container
     border="false"
      follows="left|top"
@@ -74,7 +74,7 @@
          border="true"
          follows="all"
          height="180"
-         label="Settings"
+         label="SETTINGS"
          layout="topleft"
          left="0"
          mouse_opaque="false"
@@ -331,7 +331,7 @@
          border="true"
          follows="all"
          height="180"
-         label="Image"
+         label="IMAGE"
          layout="topleft"
          left="0"
          mouse_opaque="false"
@@ -348,7 +348,7 @@
              layout="topleft"
              left="10"
              name="BHText"
-             top="10"
+             top="4"
              width="200">
                 Big Wave Direction
             </text>
@@ -361,23 +361,10 @@
              layout="topleft"
              left="10"
              name="WaterWave1DirXText"
-             top_pad="4"
+             top_pad="5"
              width="10">
                 X
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="WaterWave1DirYText"
-             top_delta="18"
-             width="10">
-                Y
-            </text>
             <slider
              control_name="WaterWave1DirX"
              decimal_digits="2"
@@ -390,8 +377,22 @@
              max_val="4"
              min_val="-4"
              name="WaterWave1DirX"
-             top="55"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WaterWave1DirYText"
+             top_pad="-15"
+             width="10">
+                Y
+            </text>
             <slider
              control_name="WaterWave1DirY"
              decimal_digits="2"
@@ -404,7 +405,8 @@
              max_val="4"
              min_val="-4"
              name="WaterWave1DirY"
-             top_pad="5"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -413,9 +415,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="BHText2"
-             top_delta="3"
+             top_pad="-10"
              width="355">
                 Little Wave Direction
             </text>
@@ -427,24 +429,12 @@
              height="16"
              layout="topleft"
              left="10"
+             left_delta="0"
              name="WaterWave2DirXText"
-             top="90"
+             top_pad="5"
              width="10">
                 X
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="WaterWave2DirYText"
-             top_delta="20"
-             width="10">
-                Y
-            </text>
             <slider
              control_name="WaterWave2DirX"
              decimal_digits="2"
@@ -457,8 +447,22 @@
              max_val="4"
              min_val="-4"
              name="WaterWave2DirX"
-             top="115"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="WaterWave2DirYText"
+             top_pad="-15"
+             width="10">
+                Y
+            </text>
             <slider
              control_name="WaterWave2DirY"
              decimal_digits="2"
@@ -471,7 +475,8 @@
              max_val="4"
              min_val="-4"
              name="WaterWave2DirY"
-             top_pad="10"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
index 0cb7814c6a..d09a41978d 100644
--- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  legacy_header_height="18"
- height="220"
+ height="256"
  layout="topleft"
  name="WindLight floater"
  help_topic="windlight_floater"
@@ -22,68 +22,64 @@
      left="10"
      name="KeyFramePresetsText"
      top="34"
-     width="110">
+     width="85">
         Sky Presets:
     </text>
     <combo_box
-     height="18"
+     height="23"
      layout="topleft"
-     left_delta="110"
+     left_delta="85"
      name="WLPresetsCombo"
-     top_delta="-2"
+     top_delta="-4"
      width="150" />
     <button
-     height="20"
+     height="23"
      label="New"
      label_selected="New"
      layout="topleft"
-     left_pad="20"
+     left_pad="3"
      name="WLNewPreset"
-     top_delta="1"
      width="70" />
     <button
-     height="20"
+     height="23"
      label="Save"
      label_selected="Save"
      layout="topleft"
-     left_pad="10"
+     left_pad="3"
      name="WLSavePreset"
-     top_delta="0"
      width="70" />
     <button
-     height="20"
+     height="23"
      label="Delete"
      label_selected="Delete"
      layout="topleft"
-     left_pad="10"
+     left_pad="3"
      name="WLDeletePreset"
-     top_delta="0"
      width="70" />
     <button
-     height="20"
+     height="23"
      label="Day Cycle Editor"
      label_selected="Day Cycle Editor"
      layout="topleft"
-     left_pad="50"
+     right="-10"
      name="WLDayCycleMenuButton"
-     top_delta="0"
+     top_pad="-23"
      width="120" />
     <tab_container
      follows="left|top"
-     height="160"
+     height="196"
      halign="center"
      layout="topleft"
      left="0"
      name="WindLight Tabs"
      tab_position="top"
-     tab_height="20"
      top="60"
      width="700">
         <panel
          border="true"
          follows="left|top|right|bottom"
-         height="160"
-         label="Atmosphere"
+         height="196"
+         label="ATMOSPHERE"
          layout="topleft"
          left="1"
          mouse_opaque="false"
@@ -113,10 +109,22 @@
              layout="topleft"
              left="10"
              name="BHText2"
-             top="21"
+             top_pad="5"
              width="10">
                 R
             </text>
+            <slider
+             control_name="WLBlueHorizonR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLBlueHorizonR"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -124,12 +132,25 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="10"
+             top_pad="-15"
              name="BHText3"
-             top_delta="11"
              width="10">
                 G
             </text>
+            <slider
+             control_name="WLBlueHorizonG"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_delta="0"
+             name="WLBlueHorizonG"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -137,12 +158,24 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
              name="BHText4"
-             top_delta="11"
+             left="10"
+             top_pad="-15"
              width="10">
                 B
             </text>
+            <slider
+             control_name="WLBlueHorizonB"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             name="WLBlueHorizonB"
+             left_pad="3"
+             top_pad="6"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -150,49 +183,13 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
              name="BHText5"
-             top_delta="11"
+             left="10"
+             top_pad="-15"
              width="10">
                 I
             </text>
             <slider
-             control_name="WLBlueHorizonR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="24"
-             name="WLBlueHorizonR"
-             top="40"
-             width="200" />
-            <slider
-             control_name="WLBlueHorizonG"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueHorizonG"
-             top_pad="1"
-             width="200" />
-            <slider
-             control_name="WLBlueHorizonB"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left_delta="0"
-             name="WLBlueHorizonB"
-             top_pad="1"
-             width="200" />
-            <slider
              control_name="WLBlueHorizonI"
              decimal_digits="2"
              follows="left"
@@ -200,9 +197,9 @@
              increment="0.01"
              initial_value="1.0"
              layout="topleft"
-             left_delta="0"
              name="WLBlueHorizonI"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -211,9 +208,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left="10"
+             top_pad="-10"
              name="BDensText"
-             top_delta="-2"
              width="355">
                 Haze Horizon
             </text>
@@ -225,9 +222,10 @@
              increment="0.01"
              initial_value="0.25"
              layout="topleft"
-             left="24"
+             left="23"
+             top_delta="0"
+             top_pad="27"
              name="WLHazeHorizon"
-             top="107"
              width="200" />
             <text
              type="string"
@@ -251,10 +249,22 @@
              layout="topleft"
              left="245"
              name="BHText6"
-             top="21"
+             top_pad="5"
              width="10">
                 R
             </text>
+            <slider
+             control_name="WLBlueDensityR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLBlueDensityR"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -262,50 +272,12 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left="245"
              name="BHText7"
-             top_delta="11"
+             top_pad="-15"
              width="10">
                 G
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText8"
-             top_delta="11"
-             width="10">
-                B
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText9"
-             top_delta="11"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLBlueDensityR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="259"
-             name="WLBlueDensityR"
-             top="40"
-             width="200" />
             <slider
              control_name="WLBlueDensityG"
              decimal_digits="2"
@@ -316,8 +288,22 @@
              layout="topleft"
              left_delta="0"
              name="WLBlueDensityG"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="BHText8"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
             <slider
              control_name="WLBlueDensityB"
              decimal_digits="2"
@@ -328,8 +314,22 @@
              layout="topleft"
              left_delta="0"
              name="WLBlueDensityB"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left="245"
+             name="BHText9"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
             <slider
              control_name="WLBlueDensityI"
              decimal_digits="2"
@@ -340,7 +340,8 @@
              layout="topleft"
              left_delta="0"
              name="WLBlueDensityI"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -349,9 +350,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left="245"
              name="HDText"
-             top_delta="-2"
+             top_pad="-10"
              width="355">
                 Haze Density
             </text>
@@ -363,10 +364,10 @@
              increment="0.01"
              initial_value="0.7"
              layout="topleft"
-             left="259"
+             left="258"
              max_val="4"
              name="WLHazeDensity"
-             top="107"
+             top_pad="27"
              width="200" />
             <text
              type="string"
@@ -389,10 +390,10 @@
              increment="0.01"
              initial_value="0.1"
              layout="topleft"
-             left="494"
+             left_delta="13"
              max_val="0.9"
              name="WLDensityMult"
-             top="40"
+             top_pad="27"
              width="200" />
             <text
              type="string"
@@ -401,9 +402,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="WLDistanceMultText"
-             top_delta="-3"
+             top_pad="-10"
              width="355">
                 Distance Multiplier
             </text>
@@ -414,11 +415,11 @@
              height="10"
              initial_value="1.0"
              layout="topleft"
-             left="494"
+             left_delta="13"
              max_val="100"
              name="WLDistanceMult"
-             top="73"
-             width="207" />
+             top_pad="27"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -426,9 +427,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="MaxAltText"
-             top_delta="-2"
+             top_pad="-15"
              width="355">
                 Max Altitude
             </text>
@@ -440,17 +441,17 @@
              increment="1"
              initial_value="500"
              layout="topleft"
-             left="494"
+             left_delta="13"
              max_val="4000"
              name="WLMaxAltitude"
-             top="107"
-             width="205" />
+             top_pad="27"
+             width="200" />
         </panel>
         <panel
          border="true"
          follows="left|top|right|bottom"
-         height="160"
-         label="Lighting"
+         height="196"
+         label="LIGHTING"
          layout="topleft"
          left_delta="0"
          help_topic="windlight_lighting_tab"
@@ -477,12 +478,24 @@
              halign="center"
              height="16"
              layout="topleft"
-             left="10"
+             left_delta="0"
              name="BHText"
-             top="21"
+             top_pad="5"
              width="10">
                 R
             </text>
+            <slider
+             control_name="WLSunlightR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLSunlightR"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -490,50 +503,12 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left_delta="-13"
              name="BHText2"
-             top_delta="11"
+             top_pad="-15"
              width="10">
                 G
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText3"
-             top_delta="11"
-             width="10">
-                B
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText4"
-             top_delta="11"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLSunlightR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="24"
-             name="WLSunlightR"
-             top="40"
-             width="200" />
             <slider
              control_name="WLSunlightG"
              decimal_digits="2"
@@ -544,8 +519,22 @@
              layout="topleft"
              left_delta="0"
              name="WLSunlightG"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText3"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
             <slider
              control_name="WLSunlightB"
              decimal_digits="2"
@@ -556,8 +545,22 @@
              layout="topleft"
              left_delta="0"
              name="WLSunlightB"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText4"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
             <slider
              control_name="WLSunlightI"
              decimal_digits="2"
@@ -568,7 +571,8 @@
              layout="topleft"
              left_delta="0"
              name="WLSunlightI"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -577,9 +581,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="TODText"
-             top_delta="-2"
+             top_pad="-10"
              width="355">
                 Sun/Moon Position
             </text>
@@ -587,9 +591,9 @@
              height="20"
              image_name="icon_diurnal.tga"
              layout="topleft"
-             left="30"
+             left_delta="14"
+             top_pad="10"
              name="SkyDayCycle"
-             top="97"
              width="148" />
             <slider
              control_name="WLSunAngle"
@@ -598,10 +602,10 @@
              increment="0.001"
              initial_value="0.7"
              layout="topleft"
-             left="24"
+             left_delta="-8"
              name="WLSunAngle"
-             top="137"
-             width="204" />
+             top_pad="20"
+             width="207" />
             <text
              type="string"
              length="1"
@@ -622,12 +626,24 @@
              halign="center"
              height="16"
              layout="topleft"
-             left="245"
+             left_delta="0"
              name="BHText5"
-             top="21"
+             top_pad="5"
              width="10">
                 R
             </text>
+            <slider
+             control_name="WLAmbientR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLAmbientR"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -635,50 +651,12 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left_delta="-13"
              name="BHText6"
-             top_delta="11"
+             top_pad="-15"
              width="10">
                 G
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText7"
-             top_delta="11"
-             width="10">
-                B
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText8"
-             top_delta="11"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLAmbientR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="259"
-             name="WLAmbientR"
-             top="40"
-             width="200" />
             <slider
              control_name="WLAmbientG"
              decimal_digits="2"
@@ -689,8 +667,22 @@
              layout="topleft"
              left_delta="0"
              name="WLAmbientG"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText7"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
             <slider
              control_name="WLAmbientB"
              decimal_digits="2"
@@ -701,8 +693,22 @@
              layout="topleft"
              left_delta="0"
              name="WLAmbientB"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText8"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
             <slider
              control_name="WLAmbientI"
              decimal_digits="2"
@@ -713,7 +719,8 @@
              layout="topleft"
              left_delta="0"
              name="WLAmbientI"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -722,9 +729,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="WLEastAngleText"
-             top_delta="-2"
+             top_pad="-10"
              width="355">
                 East Angle
             </text>
@@ -736,9 +743,9 @@
              increment="0.01"
              initial_value="0.0"
              layout="topleft"
-             left="259"
+             left_delta="13"
              name="WLEastAngle"
-             top="107"
+             top_pad="27"
              width="200" />
             <text
              type="string"
@@ -762,10 +769,10 @@
              initial_value="0.1"
              label="Focus "
              layout="topleft"
-             left="494"
+             left_delta="0"
              max_val="0.5"
              name="WLGlowB"
-             top="40"
+             top_pad="27"
              width="200" />
             <slider
              control_name="WLGlowR"
@@ -780,7 +787,7 @@
              max_val="1.99"
              min_val="1"
              name="WLGlowR"
-             top_pad="1"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -789,9 +796,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="0"
              name="SceneGammaText"
-             top_delta="0"
+             top_pad="-10"
              width="200">
                 Scene Gamma
             </text>
@@ -803,11 +810,11 @@
              increment="0.01"
              initial_value="2.0"
              layout="topleft"
-             left="494"
+             left_delta="0"
              max_val="10"
              name="WLGamma"
-             top="87"
-             width="207" />
+             top_pad="27"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -815,9 +822,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="0"
              name="WLStarText"
-             top_delta="-1"
+             top_pad="-10"
              width="355">
                 Star Brightness
             </text>
@@ -829,17 +836,17 @@
              increment="0.01"
              initial_value="0"
              layout="topleft"
-             left="494"
+             left_delta="0"
              max_val="2"
              name="WLStarAlpha"
-             top="122"
+             top_pad="27"
              width="200" />
         </panel>
         <panel
          border="true"
          follows="left|top|right|bottom"
-         height="160"
-         label="Clouds"
+         height="196"
+         label="CLOUDS"
          layout="topleft"
          left_delta="0"
          mouse_opaque="false"
@@ -867,12 +874,24 @@
              halign="center"
              height="16"
              layout="topleft"
-             left="10"
+             left_delta="0"
              name="BHText"
-             top="21"
+             top_pad="5"
              width="10">
                 R
             </text>
+            <slider
+             control_name="WLCloudColorR"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.7"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLCloudColorR"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -880,50 +899,12 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left_delta="-13"
              name="BHText2"
-             top_delta="11"
+             top_pad="-15"
              width="10">
                 G
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText3"
-             top_delta="11"
-             width="10">
-                B
-            </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText4"
-             top_delta="11"
-             width="10">
-                I
-            </text>
-            <slider
-             control_name="WLCloudColorR"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.7"
-             layout="topleft"
-             left="24"
-             name="WLCloudColorR"
-             top="40"
-             width="200" />
             <slider
              control_name="WLCloudColorG"
              decimal_digits="2"
@@ -934,8 +915,22 @@
              layout="topleft"
              left_delta="0"
              name="WLCloudColorG"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText3"
+             top_pad="-15"
+             width="10">
+                B
+            </text>
             <slider
              control_name="WLCloudColorB"
              decimal_digits="2"
@@ -946,8 +941,22 @@
              layout="topleft"
              left_delta="0"
              name="WLCloudColorB"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText4"
+             top_pad="-15"
+             width="10">
+                I
+            </text>
             <slider
              control_name="WLCloudColorI"
              decimal_digits="2"
@@ -958,7 +967,8 @@
              layout="topleft"
              left_delta="0"
              name="WLCloudColorI"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -967,9 +977,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="WLCloudColorText2"
-             top_delta="-2"
+             top_pad="-10"
              width="355">
                 Cloud XY/Density
             </text>
@@ -980,12 +990,24 @@
              halign="center"
              height="16"
              layout="topleft"
-             left="10"
+             left_delta="0"
              name="BHText5"
-             top="87"
+             top_pad="5"
              width="10">
                 X
             </text>
+            <slider
+             control_name="WLCloudX"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLCloudX"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -993,12 +1015,24 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left_delta="-13"
              name="BHText6"
-             top_delta="11"
+             top_pad="-15"
              width="10">
                 Y
             </text>
+            <slider
+             control_name="WLCloudY"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLCloudY"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -1006,37 +1040,13 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left_delta="-13"
              name="BHText7"
-             top_delta="11"
+             top_pad="-15"
              width="10">
                 D
             </text>
             <slider
-             control_name="WLCloudX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_pad="4"
-             name="WLCloudX"
-             top_delta="-2"
-             width="200" />
-            <slider
-             control_name="WLCloudY"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_delta="0"
-             name="WLCloudY"
-             top_pad="1"
-             width="200" />
-            <slider
              control_name="WLCloudDensity"
              decimal_digits="2"
              follows="left"
@@ -1046,7 +1056,8 @@
              layout="topleft"
              left_delta="0"
              name="WLCloudDensity"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
@@ -1069,9 +1080,9 @@
              increment="0.01"
              initial_value="0.5"
              layout="topleft"
-             left="259"
+             left_delta="13"
              name="WLCloudCoverage"
-             top="40"
+             top_pad="27"
              width="200" />
             <text
              type="string"
@@ -1080,9 +1091,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="WLCloudScaleText"
-             top_delta="-1"
+             top_pad="-10"
              width="355">
                 Cloud Scale
             </text>
@@ -1094,10 +1105,10 @@
              increment="0.01"
              initial_value="1.0"
              layout="topleft"
-             left="259"
+             left_delta="13"
              min_val="0.01"
              name="WLCloudScale"
-             top="75"
+             top_pad="27"
              width="200" />
             <text
              type="string"
@@ -1106,9 +1117,9 @@
              font="SansSerif"
              height="16"
              layout="topleft"
-             left_delta="-14"
+             left_delta="-13"
              name="WLCloudDetailText"
-             top_delta="-4"
+             top_pad="-10"
              width="355">
                 Cloud Detail (XY/Density)
             </text>
@@ -1119,12 +1130,24 @@
              halign="center"
              height="16"
              layout="topleft"
-             left="245"
+             left_delta="0"
              name="BHText8"
-             top="87"
+             top_pad="5"
              width="10">
                 X
             </text>
+            <slider
+             control_name="WLCloudDetailX"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             layout="topleft"
+             left_pad="3"
+             top_pad="6"
+             name="WLCloudDetailX"
+             width="200" />
             <text
              type="string"
              length="1"
@@ -1132,37 +1155,12 @@
              halign="center"
              height="16"
              layout="topleft"
-             left_delta="0"
+             left_delta="-13"
              name="BHText9"
-             top_delta="11"
+             top_pad="-15"
              width="10">
                 Y
             </text>
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             halign="center"
-             height="16"
-             layout="topleft"
-             left_delta="0"
-             name="BHText10"
-             top_delta="11"
-             width="10">
-                D
-            </text>
-            <slider
-             control_name="WLCloudDetailX"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             layout="topleft"
-             left_pad="4"
-             name="WLCloudDetailX"
-             top_delta="-2"
-             width="200" />
             <slider
              control_name="WLCloudDetailY"
              decimal_digits="2"
@@ -1173,8 +1171,22 @@
              layout="topleft"
              left_delta="0"
              name="WLCloudDetailY"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             halign="center"
+             height="16"
+             layout="topleft"
+             left_delta="-13"
+             name="BHText10"
+             top_pad="-15"
+             width="10">
+                D
+            </text>
             <slider
              control_name="WLCloudDetailDensity"
              decimal_digits="2"
@@ -1185,7 +1197,8 @@
              layout="topleft"
              left_delta="0"
              name="WLCloudDetailDensity"
-             top_pad="1"
+             left_pad="3"
+             top_pad="6"
              width="200" />
             <text
              type="string"
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 9436b2cd73..2c97112e38 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -44,11 +44,24 @@
      name="Object Sit">
         <menu_item_call.on_click
          function="Object.SitOrStand" />
+        <menu_item_call.on_visible
+         function="Object.SitVisible" />
         <menu_item_call.on_enable
          function="Object.EnableSitOrStand"
-         name="EnableSitOrStand"
-         parameter="Sit Here,Stand Up" />
-    </menu_item_call>
+         name="EnableSitOrStand" />
+   </menu_item_call>
+   <menu_item_call
+     enabled="false"
+     label="Stand Up"
+     name="Object Stand Up">
+        <menu_item_call.on_click
+         function="Object.SitOrStand" />
+        <menu_item_call.on_visible
+         function="Object.StandUpVisible" />
+        <menu_item_call.on_enable
+         function="Object.EnableSitOrStand"
+         name="EnableSitOrStand" />
+   </menu_item_call>
    <menu_item_call
        label="Object Profile"
        name="Object Inspect">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 824163c71d..4d5dc15115 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1036,7 +1036,6 @@ Unable to write file [[FILE]]
    type="alertmodal">
 Just so you know, your computer does not meet [APP_NAME]&apos;s minimum system requirements. You may experience poor performance. Unfortunately, the [SUPPORT_SITE] can't provide technical support for unsupported system configurations.
 
-MINSPECS
 Visit [_URL] for more information?
     <url option="0" name="url">
 
@@ -5913,7 +5912,8 @@ Are you sure you want to close all IMs?
     <usetemplate
      name="okcancelignore"
      notext="Cancel"
-     yestext="OK"/>
+     yestext="OK"
+     ignoretext="Confirm before I close all IMs"/>
   </notification>
 
   <notification icon="notifytip.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 4c5d5a1b96..015a2e91ff 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -47,6 +47,7 @@
          min_height="23"
          width="310"
          top="4"
+         max_width="320"
          min_width="216"
          name="chat_bar"
          user_resize="false"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
index d31e7d2ed8..66d5389d9b 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
@@ -59,7 +59,7 @@
      layout="topleft"
      top="0"
      background_visible="false"
-     height="600"
+     height="610"
      left="0"
      width="285">
     <texture_picker
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 66070c028d..befeb182f9 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -89,13 +89,13 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="700"
+         height="630"
          layout="topleft"
          left="0"
          min_height="300"
          name="scrolling_panel"
          top="0"
-         width="285">
+         width="310">
             <texture_picker
              enabled="false"
          follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index fdc26b5c46..ee8bca6f83 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -10,10 +10,10 @@
    border="false"
    background_visible="true"
    bg_alpha_color="DkGray2"
-   follows="left|top|right|bottom">
+   follows="all">
     <accordion
-     follows="left|top|right|bottom"
-     height="368"
+     follows="all"
+     height="360"
      layout="topleft"
      left="0"
      name="landmarks_accordion"
@@ -27,7 +27,7 @@
              allow_multi_select="true"
              border="false"
              bottom="0"
-             follows="left|top|right|bottom"
+             follows="all"
              height="126"
              left="0"
              mouse_opaque="true"
@@ -43,7 +43,7 @@
              allow_multi_select="true"
              border="false"
              bottom="0"
-             follows="left|top|right|bottom"
+             follows="all"
              height="126"
              left="0"
              mouse_opaque="true"
@@ -59,7 +59,7 @@
              allow_multi_select="true"
              border="false"
              bottom="0"
-             follows="left|top|right|bottom"
+             follows="all"
              height="126"
              left="0"
              mouse_opaque="true"
@@ -75,8 +75,8 @@
              allow_multi_select="true"
              border="false"
              bottom="0"
-             follows="left|top|right|bottom"
-             height="120"
+             follows="all"
+             height="126"
              left="0"
              mouse_opaque="true"
              name="library_list"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 088f098f85..1d99de1fa7 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -8,12 +8,6 @@
  name="chat_bar"
  top="21"
  width="310">
-    <string name="min_width">
-        216
-    </string>
-    <string name="max_width">
-        320
-    </string>
     <line_editor
      border_style="line"
      border_thickness="1"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index daab52f06a..540e17e413 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -222,7 +222,7 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or click on a user to add them as a friend.
+                To add friends try [secondlife:///app/search/people global search] or use right-click on a user to add them as a friend.
 If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
              </text>
         </panel>
@@ -373,7 +373,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t
          layout="topleft"
          name="view_profile_btn"
          tool_tip="Show picture, groups, and other Residents information"
-         width="64" />
+         width="70" />
         <button
          follows="bottom|left"
          left_pad="3"
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index b22dad5841..44b2508e56 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -174,13 +174,13 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="700"
+         height="540"
          layout="topleft"
          left="0"
          min_height="300"
          name="scrolling_panel"
          top="0"
-         width="285">
+         width="310">
             <texture_picker
              enabled="false"
          follows="left|top|right"
@@ -318,7 +318,7 @@
              width="268" />
             <accordion
              follows="all"
-             height="230"
+             height="223"
              layout="topleft"
              left="0"
              name="advanced_info_accordion"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 099c789e4b..d11aebe943 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -141,7 +141,34 @@
          label="General"
          name="Desired_PG"
          value="13" />
+        <combo_box.commit_callback
+		 function="Pref.MaturitySettings"/>
     </combo_box>
+    <icon
+     follows="left|top"
+     height="16"
+     image_name="Parcel_PG_Dark"
+     layout="topleft"
+     left_pad="5"
+     name="rating_icon_general"
+     top_delta="3"
+     width="18"/>
+    <icon
+     follows="left|top"
+     height="16"
+     image_name="Parcel_M_Dark"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_moderate"
+     width="18"/>
+    <icon
+     follows="left|top"
+     height="16"
+     image_name="Parcel_R_Dark"
+     layout="topleft"
+     left_pad="2"
+     name="rating_icon_adult"
+     width="18"/>
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 4167401338..c188c1bf8b 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -51,12 +51,12 @@
      image_unselected="spacer35.tga"
      image_pressed="spacer35.tga"
      height="16"
-     right="-204"
+     right="-210"
      label_shadow="false"
      name="buycurrency"
      tool_tip="My Balance"
      top="3"
-     width="100" />
+     width="110" />
     <button
      auto_resize="true"
      halign="right"
@@ -66,7 +66,7 @@
      image_unselected="BuyArrow_Over"
      image_pressed="BuyArrow_Press"
      height="16"
-     label="Buy L$"
+     label="Buy"
      label_color="EmphasisColor"
      left_pad="0"
      label_shadow="false"
@@ -93,21 +93,21 @@
     </text>
     <button
      follows="right|top"
-     height="15"
+     height="16"
      image_selected="Pause_Off"
      image_unselected="Play_Off"
      image_pressed="Play_Press"
      image_pressed_selected="Pause_Press"
      is_toggle="true"
      left_pad="15"
-     top="2"
+     top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
      width="16" >
     </button>
     <button
      follows="right|top"
-     height="15"
+     height="16"
      image_selected="AudioMute_Off"
      image_pressed="Audio_Press"
      image_unselected="Audio_Off"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index ecf7252a11..0d4f67f94c 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -53,7 +53,7 @@
              top="0"
              width="380">
 	        </flat_list_view>
-	    </accordion_tab>5
+	    </accordion_tab>
         <accordion_tab
          layout="topleft"
          name="3_days_ago"
@@ -154,7 +154,7 @@
      width="380">
         <button
          follows="bottom|left"
-         tool_tip="Show additional optioins"
+         tool_tip="Show additional options"
          height="18"
          image_disabled="OptionsMenu_Disabled"
          image_selected="OptionsMenu_Press"
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index a9a760b3a4..32e443a058 100644
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
@@ -3,6 +3,7 @@
   clear_button_visible="false"
   search_button_visible="true"
   text_pad_left="6" 
+  text_pad_right="6" 
   select_on_focus="true"
   text_tentative_color="TextFgTentativeColor"
   background_image="TextField_Search_Off"
@@ -21,5 +22,6 @@
    image_unselected="Icon_Close_Foreground"
    image_selected="Icon_Close_Press"
    pad_right="4"
+   pad_left="4"
    width="16" />
 </search_editor>