Merge

17 files changed, 848 insertions, 896 deletions

diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
index ea15c88380..83f67344ca 100644
--- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="bottom_tray">
-	<string name="SpeakBtnToolTip" value="Schaltet Mikrofon ein/aus"/>
-	<string name="VoiceControlBtnToolTip" value="Voice-Chat-Steuerung anzeigen/ausblenden"/>
+	<string name="SpeakBtnToolTip">
+		Schaltet Mikrofon ein/aus
+	</string>
+	<string name="VoiceControlBtnToolTip">
+		Voice-Chat-Steuerung anzeigen/ausblenden
+	</string>
 	<layout_stack name="toolbar_stack">
 		<layout_panel name="speak_panel">
 			<talk_button name="talk">
-				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/>
+				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn" />
 			</talk_button>
 		</layout_panel>
 		<layout_panel name="gesture_panel">
@@ -20,21 +24,6 @@
 		<layout_panel name="snapshot_panel">
 			<button label="" name="snapshots" tool_tip="Foto machen"/>
 		</layout_panel>
-		<layout_panel name="sidebar_btn_panel">
-			<button label="Seitenleiste" name="sidebar_btn" tool_tip="Seitenleiste anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<button label="Bauen" name="build_btn" tool_tip="Bauwerkzeuge ein-/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<button label="Suche" name="search_btn" tool_tip="Suche anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<button label="Karte" name="world_map_btn" tool_tip="Karte ein-/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<button label="Minikarte" name="mini_map_btn" tool_tip="Minikarte ein-/ausblenden"/>
-		</layout_panel>
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
 				<button name="Unread IM messages" tool_tip="IMs"/>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a96dbe3553..efc1a66d95 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -335,6 +335,7 @@
     </combo_box>
     <button
      left_pad="0"
+     image_disabled="ForwardArrow_Disabled"
      image_selected="ForwardArrow_Press"
      image_unselected="ForwardArrow_Off"
      layout="topleft"
@@ -823,7 +824,7 @@
              height="10"
              left="10"
              name="Name:"
-             top="5"
+             top="0"
              width="90">
                 Name:
             </text>
@@ -910,34 +911,29 @@
              width="75">
                 Group:
             </text>
-            <name_box
-             follows="left|top"
-             height="18"
-             initial_value="Loading..."
-             layout="topleft"
-             left_pad="23"
-             name="Group Name Proxy"
-             width="142" />
             <button
 			 follows="top|left"
-			 height="23"
-			 image_overlay="Edit_Wrench"
+			 height="10"
+			 image_disabled="Activate_Checkmark"
+			 image_selected="Activate_Checkmark"
+			 image_unselected="Activate_Checkmark"
+			 image_color="White_50"
 			 layout="topleft"
-			 left_pad="3"
+			 left_pad="0"
+			 top_delta="0"
 			 name="button set group"
 			 tab_stop="false"
 			 tool_tip="Choose a group to share this object's permissions"
-			 width="23" />
-            <check_box
-             height="19"
+			 width="10" />
+            <name_box
              follows="left|top"
-             label="Share"
+             height="18"
+             initial_value="Loading..."
              layout="topleft"
-             name="checkbox share with group"
-             tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-             top_pad="10"
-             left="106"
-             width="87" />
+             left_pad="5"
+             top_delta="-1"
+             name="Group Name Proxy"
+             width="150" />
             <button
              follows="top|left"
              height="23"
@@ -945,16 +941,26 @@
              label_selected="Deed"
              layout="topleft"
              name="button deed"
-             left_pad="3"
+             top_pad="0"
+             left="108"
              tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
              width="80" />
+            <check_box
+             height="19"
+             follows="left|top"
+             label="Share"
+             layout="topleft"
+             name="checkbox share with group"
+             tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+             left_pad="3"
+             width="100" />
             <text
              type="string"
              length="1"
              follows="left|top"
              height="16"
              layout="topleft"
-             top_pad="10"
+             top_pad="15"
              left="10"
              name="label click action"
              width="98">
@@ -1006,7 +1012,7 @@
             follows="left|top"
             allow_text_entry="false"
             height="23"
-            initial_value="2"
+            intial_value="2"
             max_chars="20"
             mouse_opaque="true"
             name="sale type"
@@ -2170,6 +2176,8 @@ even though the user gets a free copy.
              width="60" />
             <color_swatch
              can_apply_immediately="true"
+	     bevel_style="none"
+	     border_style="line"
              color="0.5 0.5 0.5 1"
 	     border.border_thickness="0"
              follows="left|top"
@@ -2204,71 +2212,43 @@ even though the user gets a free copy.
              name="Light Intensity"
              top_pad="3"
              width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.1"
-                   initial_value="0.5"
-                   label="FOV"
-                   label_width="55"
-                   left="144"
-                   max_val="3"
-                   min_val="0"
-                   mouse_opaque="true"
-                   name="Light FOV"
-                   width="120" />
-          <spinner follows="left|top"
-                   height="19"
-                   initial_value="5"
-                   label="Radius"
-                   label_width="70"
-                   layout="topleft"
-                   left="10"
-                   max_val="20"
-                   name="Light Radius"
-                   top_pad="3"
-                   width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.5"
-                   initial_value="0.5"
-                   label="Focus"
-                   label_width="55"
-                   left="144"
-                   max_val="20"
-                   min_val="-20"
-                   mouse_opaque="true"
-                   name="Light Focus"
-                   width="120" />
-          <spinner follows="left|top"
-                   height="19"
-                   increment="0.25"
-                   initial_value="1"
-                   label="Falloff"
-                   label_width="70"
-                   layout="topleft"
-                   left="10"
-                   max_val="2"
-                   name="Light Falloff"
-                   top_pad="3"
-                   width="128" />
-          <spinner bottom_delta="0"
-                   decimal_digits="3"
-                   follows="left|top"
-                   height="16"
-                   increment="0.05"
-                   initial_value="1"
-                   label="Ambiance"
-                   label_width="55"
-                   left="144"
-                   max_val="1"
-                   min_val="0"
-                   mouse_opaque="true"
-                   name="Light Ambiance"
-                   width="120" />
+          <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+ increment="0.1" initial_val="0.5" label="FOV" label_width="55"
+ left="144" max_val="3" min_val="0" mouse_opaque="true"
+ name="Light FOV" width="120" />
+          <spinner
+             follows="left|top"
+             height="19"
+             initial_value="5"
+             label="Radius"
+             label_width="70"
+             layout="topleft"
+             left="10"
+             max_val="20"
+             name="Light Radius"
+             top_pad="3"
+             width="128" />
+          <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+        increment="0.5" initial_val="0.5" label="Focus" label_width="55"
+        left="144" max_val="20" min_val="-20" mouse_opaque="true"
+        name="Light Focus" width="120" />
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.25"
+             initial_value="1"
+             label="Falloff"
+             label_width="70"
+             layout="topleft"
+             left="10"
+             max_val="2"
+             name="Light Falloff"
+             top_pad="3"
+             width="128" />
+          <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+           increment="0.05" initial_val="1" label="Ambiance" label_width="55"
+           left="144" max_val="1" min_val="0" mouse_opaque="true"
+           name="Light Ambiance" width="120" />
         </panel>
          <panel
          border="false"
@@ -2293,7 +2273,6 @@ even though the user gets a free copy.
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"
-             fallback_image="locked_image.j2c"
              follows="left|top"
              height="80"
              label="Texture"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2641ce4ee4..1f5c8a95a8 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -29,7 +29,9 @@
             <menu_item_call.on_click
              function="BuyCurrency" />
         </menu_item_call>
+
         <menu_item_separator/>
+
         <menu_item_call
          label="My Profile"
          name="Profile">
@@ -124,7 +126,9 @@
             <menu_item_call.on_click
              function="Advanced.LeaveAdminStatus" />
         </menu_item_call>
+
         <menu_item_separator/>
+
         <menu_item_call
          label="Exit [APP_NAME]"
          name="Quit"
@@ -153,7 +157,9 @@
              function="SideTray.PanelPeopleTab"
              parameter="groups_panel" />
         </menu_item_call>
+
         <menu_item_separator/>
+
         <!--menu_item_call
          label="Chat"
          name="Chat">
@@ -251,7 +257,9 @@
              parameter="region_info" />
         </menu_item_call>
         </menu>
+
         <menu_item_separator/>
+
         <menu_item_call
              label="Buy This Land"
              name="Buy Land">
@@ -348,7 +356,9 @@
                control="NavBarShowParcelProperties" />
           </menu_item_check>
         </menu>
+
         <menu_item_separator/>
+
 	    <menu_item_call
 	     label="Teleport Home"
 	     name="Teleport Home"
@@ -387,7 +397,9 @@
              parameter="ShowNavbarFavoritesPanel" />
         </menu_item_check>
         <menu_item_separator/>-->
+
         <menu_item_separator/>
+
     <menu
          create_jump_keys="true"
          label="Sun"
@@ -430,7 +442,9 @@
                  function="World.EnvSettings"
                  parameter="default" />
             </menu_item_call>
+
             <menu_item_separator/>
+
             <menu_item_call
              label="Environment Editor"
              name="Environment Editor">
@@ -579,6 +593,7 @@
             </menu_item_call>
         </menu>
         <menu_item_separator/>
+
         <menu_item_call
            label="Focus on Selection"
            name="Focus on Selection"
@@ -599,7 +614,9 @@
           <menu_item_call.on_enable
              function="Tools.SomethingSelectedNoHUD" />
         </menu_item_call>
+
         <menu_item_separator/>
+
         <menu
          create_jump_keys="true"
          label="Object"
@@ -701,7 +718,9 @@
                function="EditableSelected" />
           </menu_item_call>
         </menu>
+
         <menu_item_separator/>
+
         <menu
          create_jump_keys="true"
          label="Options"
@@ -724,7 +743,9 @@
 				 function="ToggleControl"
 				 parameter="DebugPermissions" />
 			</menu_item_check>
+
             <menu_item_separator/>
+
             <menu_item_check
                  label="Select Only My Objects"
                  name="Select Only My Objects">
@@ -751,7 +772,9 @@
                     <menu_item_check.on_click
                      function="Tools.SelectBySurrounding" />
             </menu_item_check>
+
           <menu_item_separator/>
+
                 <menu_item_check
                  label="Show Hidden Selection"
                  name="Show Hidden Selection">
@@ -777,7 +800,9 @@
                      function="ToggleControl"
                      parameter="ShowSelectionBeam" />
                 </menu_item_check>
+
         <menu_item_separator/>
+
                 <menu_item_check
                  label="Snap to Grid"
                  name="Snap to Grid"
@@ -896,7 +921,9 @@
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>-->
+
         <menu_item_separator/>
+
         <menu_item_call
              label="Report Abuse"
              name="Report Abuse">
@@ -910,7 +937,9 @@
                  function="ShowHelp"
                  parameter="report_bug" />
             </menu_item_call>
+
         <menu_item_separator/>
+
         <menu_item_call
          label="About [APP_NAME]"
          name="About Second Life">
@@ -961,7 +990,9 @@
            function="Floater.Show"
            parameter="window_size" />
         </menu_item_call>
+
         <menu_item_separator/>
+
         <menu_item_check
          label="Limit Select Distance"
          name="Limit Select Distance">
@@ -982,7 +1013,9 @@
              function="ToggleControl"
              parameter="DisableCameraConstraints" />
         </menu_item_check>
+
         <menu_item_separator/>
+
         <menu_item_check
          label="High-res Snapshot"
          name="HighResSnapshot">
@@ -1013,7 +1046,9 @@
              function="ToggleControl"
              parameter="CompressSnapshotsToDisk" />
         </menu_item_check>
+
         <menu_item_separator/>
+
         <menu
          create_jump_keys="true"
          label="Performance Tools"
@@ -1126,7 +1161,9 @@
                 <menu_item_check.on_click
                  function="View.ShowHoverTips" />
             </menu_item_check>
+
             <menu_item_separator/>
+
             <menu_item_check
              label="Show Land Tooltips"
              name="Land Tips">
@@ -1433,7 +1470,9 @@
              function="ToggleControl"
              parameter="MouseSmooth" />
         </menu_item_check>
+
         <menu_item_separator/>
+
         <menu
          label="Shortcuts"
          name="Shortcuts"
@@ -1477,7 +1516,9 @@
                 <menu_item_call.on_click
                  function="View.DefaultUISize" />
             </menu_item_call>
+
             <menu_item_separator/>
+
             <menu_item_check
              label="Always Run"
              name="Always Run"
@@ -1498,7 +1539,9 @@
                 <menu_item_check.on_enable
                  function="Agent.enableFlying" />
             </menu_item_check>
+
             <menu_item_separator/>
+
             <menu_item_call
              label="Close Window"
              name="Close Window"
@@ -1517,7 +1560,9 @@
                 <menu_item_call.on_enable
                  function="File.EnableCloseAllWindows" />
             </menu_item_call>
+
             <menu_item_separator/>
+
             <menu_item_call
              label="Snapshot to Disk"
              name="Snapshot to Disk"
@@ -1526,7 +1571,9 @@
                 <menu_item_call.on_click
                  function="File.TakeSnapshotToDisk" />
             </menu_item_call>
+
             <menu_item_separator/>
+
             <menu_item_call
              label="Mouselook"
              name="Mouselook"
@@ -1563,7 +1610,9 @@
                 <menu_item_call.on_enable
                  function="View.EnableLastChatter" />
             </menu_item_call>
+
             <menu_item_separator/>
+
             <menu
              create_jump_keys="true"
              label="Select Build Tool"
@@ -1610,7 +1659,9 @@
                      parameter="land" />
                 </menu_item_call>
             </menu>
+
             <menu_item_separator/>
+
             <menu_item_call
              label="Zoom In"
              name="Zoom In"
@@ -1633,7 +1684,9 @@
                  function="View.ZoomOut" />
             </menu_item_call>
         </menu>
+
         <menu_item_separator/>
+
         <menu_item_call
          label="Show Debug Settings"
          name="Debug Settings">
@@ -1743,7 +1796,9 @@
                  function="Advanced.ToggleConsole"
                  parameter="memory view" />
             </menu_item_check>
+
             <menu_item_separator/>
+
             <menu_item_call
              label="Region Info to Debug Console"
              name="Region Info to Debug Console">
@@ -1765,7 +1820,9 @@
                  function="Advanced.DumpInfoToConsole"
                  parameter="capabilities" />
             </menu_item_call>
+
             <menu_item_separator/>
+
             <menu_item_check
              label="Camera"
              name="Camera">
@@ -1853,7 +1910,9 @@
                  function="ToggleControl"
                  parameter="DebugShowColor" />
             </menu_item_check>
+
             <menu_item_separator/>
+
             <menu_item_check
              label="Show Updates to Objects"
              name="Show Updates"
@@ -1865,7 +1924,9 @@
                  function="Advanced.ToggleShowObjectUpdates" />
             </menu_item_check>
         </menu>
+
         <menu_item_separator/>
+
         <menu
          create_jump_keys="true"
          label="Force an Error"
@@ -2159,9 +2220,12 @@
             <menu_item_check.on_enable
                  function="Advanced.EnableRenderFBO" />
            </menu_item_check>
+
+          <menu_item_separator />
+
           <menu_item_check
-                       label="Deferred Rendering"
-                       name="Deferred Rendering">
+                       label="Lighting and Shadows"
+                       name="Lighting and Shadows">
             <menu_item_check.on_check
              function="CheckControl"
              parameter="RenderDeferred" />
@@ -2172,7 +2236,31 @@
                  function="Advanced.EnableRenderDeferred" />
           </menu_item_check>
           <menu_item_check
-                   label="Global Illumination"
+                       label="   Shadows from Sun/Moon/Projectors"
+                       name="Shadows from Sun/Moon/Projectors">
+            <menu_item_check.on_check
+             function="Advanced.CheckRenderShadowOption"
+             parameter="RenderShadowDetail" />
+            <menu_item_check.on_click
+             function="Advanced.ClickRenderShadowOption"
+             parameter="RenderShadowDetail" />
+            <menu_item_check.on_enable
+                 function="Advanced.EnableRenderDeferredOptions" />
+          </menu_item_check>
+          <menu_item_check
+                   label="   SSAO and Shadow Smoothing"
+                   name="SSAO and Shadow Smoothing">
+            <menu_item_check.on_check
+             function="CheckControl"
+             parameter="RenderDeferredSSAO" />
+            <menu_item_check.on_click
+             function="ToggleControl"
+             parameter="RenderDeferredSSAO" />
+            <menu_item_check.on_enable
+                 function="Advanced.EnableRenderDeferredOptions" />
+          </menu_item_check>
+          <menu_item_check
+                   label="   Global Illumination (experimental)"
                    name="Global Illumination">
             <menu_item_check.on_check
              function="CheckControl"
@@ -2181,9 +2269,11 @@
              function="ToggleControl"
              parameter="RenderDeferredGI" />
             <menu_item_check.on_enable
-                 function="Advanced.EnableRenderDeferredGI" />
+                 function="Advanced.EnableRenderDeferredOptions" />
           </menu_item_check>
+
           <menu_item_separator />
+
           <menu_item_check
              label="Debug GL"
              name="Debug GL">
@@ -2205,14 +2295,24 @@
                  parameter="RenderDebugPipeline" />
             </menu_item_check>
             <menu_item_check
-             label="Fast Alpha"
-             name="Fast Alpha">
+             label="Automatic Alpha Masks (deferred)"
+             name="Automatic Alpha Masks (deferred)">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="RenderAutoMaskAlphaDeferred" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="RenderAutoMaskAlphaDeferred" />
+            </menu_item_check>
+            <menu_item_check
+             label="Automatic Alpha Masks (non-deferred)"
+             name="Automatic Alpha Masks (non-deferred)">
                 <menu_item_check.on_check
                  function="CheckControl"
-                 parameter="RenderFastAlpha" />
+                 parameter="RenderAutoMaskAlphaNonDeferred" />
                 <menu_item_check.on_click
                  function="ToggleControl"
-                 parameter="RenderFastAlpha" />
+                 parameter="RenderAutoMaskAlphaNonDeferred" />
             </menu_item_check>
             <menu_item_check
              label="Animation Textures"
@@ -2255,7 +2355,7 @@
                parameter="AuditTexture" />
             </menu_item_check>
             <menu_item_check
-             label="Texture Atlas"
+             label="Texture Atlas (experimental)"
              name="Texture Atlas">
               <menu_item_check.on_check
                function="CheckControl"
@@ -2311,7 +2411,9 @@
                  function="ToggleControl"
                  parameter="AgentPause" />
             </menu_item_check>
+
             <menu_item_separator/>
+
             <menu_item_call
              label="Enable Message Log"
              name="Enable Message Log">
@@ -2324,7 +2426,9 @@
                 <menu_item_call.on_click
                  function="Advanced.DisableMessageLog" />
             </menu_item_call>
+
             <menu_item_separator/>
+
             <menu_item_check
              label="Velocity Interpolate Objects"
              name="Velocity Interpolate Objects">
@@ -2345,7 +2449,9 @@
                  function="ToggleControl"
                  parameter="PingInterpolate" />
             </menu_item_check>
+
             <menu_item_separator/>
+
             <menu_item_call
              label="Drop a Packet"
              name="Drop a Packet"
@@ -2533,6 +2639,7 @@
             </menu_item_check>
 
             <menu_item_separator />
+
             <menu_item_check
              label="Debug SelectMgr"
              name="Debug SelectMgr">
@@ -2878,7 +2985,9 @@
                  function="Advanced.DumpAvatarLocalTextures" />
             </menu_item_call>
         </menu>
+
         <menu_item_separator/>
+
         <menu_item_check
          label="HTTP Textures"
          name="HTTP Textures">
@@ -2915,7 +3024,9 @@
              function="ToggleControl"
              parameter="ShowConsoleWindow" />
         </menu_item_check>
+
         <menu_item_separator/>
+
         <menu_item_check
          label="Show Admin Menu"
          name="View Admin Options">
@@ -3250,7 +3361,9 @@
                      name="PublicIssueTrackerHelp_url"
                      parameter="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
                 </menu_item_call>
+
                 <menu_item_separator/>
+
                 <menu_item_call
                  label="Bug Reporting 101"
                  name="Bug Reporing 101">
diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 4f989a6f6f..4e5f594ffe 100644
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
@@ -57,8 +57,7 @@
      left="0"
      height="23"
      width="23"
-     tab_stop="false"
-     tool_tip="You don't have permission to edit">
+     tab_stop="false">
         <icon 
          name="btn_lock1"
          layout="topleft"
@@ -89,8 +88,7 @@
           left="0"
           height="23"
           width="23"
-          tab_stop="false"
-          tool_tip="Edit this shape"/>
+          tab_stop="false" />
       </panel>
     <icon
      follows="left|right|top"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 4b622691b3..4eff5bc48a 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -503,17 +503,5 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                 </button>
             </chiclet_notification>
         </layout_panel>
-      <icon
-         auto_resize="false"
-         color="0 0 0 0"
-         follows="left|right"
-         height="10"
-         image_name="spacer24.tga"
-         layout="topleft"
-         left="0"
-         min_width="4"
-         name="DUMMY2"
-         top="0"
-         width="8" />
     </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index 93d7720c57..5d81aebbd5 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
@@ -37,8 +37,7 @@
      left="0"
      height="18"
      width="18"
-     tab_stop="false"
-     tool_tip="Remove from outfit" />
+     tab_stop="false" />
     <icon
      height="16"
      follows="top|left"
@@ -89,8 +88,7 @@
      left="0"
      height="23"
      width="23"
-     tab_stop="false"
-     tool_tip="You don't have permission to edit">
+     tab_stop="false">
         <icon 
          name="btn_lock1"
          layout="topleft"
@@ -121,8 +119,7 @@
          left="0"
          height="23"
          width="23"
-         tab_stop="false"
-         tool_tip="Edit this wearable"/>
+         tab_stop="false" />
       </panel>
     <icon
      follows="left|right|top"
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index f438e3d42d..d36c2a4e6f 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -22,40 +22,35 @@
      width="311">
         <accordion_tab
          layout="topleft"
-         name="tab_clothing"
-         title="Clothing">
+         name="tab_attachments"
+         title="Attachments">
             <flat_list_view
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="3"
-             keep_selection_visible_on_reshape="true"
+             item_pad="2"
              layout="topleft"
              left="0"
              multi_select="true"
-             name="list_clothing"
+             name="list_attachments"
              top="0"
              width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
-         name="tab_attachments"
-         title="Attachments">
+         name="tab_clothing"
+         title="Clothing">
             <flat_list_view
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="3"
+             item_pad="2"
              layout="topleft"
              left="0"
-             keep_selection_visible_on_reshape="true"
              multi_select="true"
-             name="list_attachments"
+             name="list_clothing"
              top="0"
-             width="311">
-              <flat_list_view.no_items_text
-               value="No attachments worn" />
-              </flat_list_view>
+             width="311" />
         </accordion_tab>
         <accordion_tab
          layout="topleft"
@@ -65,8 +60,7 @@
              allow_select="true"
              follows="all"
              height="10"
-             item_pad="3"
-             keep_selection_visible_on_reshape="true"
+             item_pad="2"
              layout="topleft"
              left="0"
              multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
index 75b5fd1532..45031859f1 100644
--- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
@@ -37,8 +37,7 @@
      left="0"
      height="18"
      width="18"
-     tab_stop="false"
-     tool_tip="Remove from outfit"/>
+     tab_stop="false" />
     <icon
      height="16"
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index a5dd34bd22..20652df918 100644
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
@@ -49,27 +49,16 @@
      top="4"
      value="..."
      width="359" />
-    <panel
-     name="btn_add_panel"
+    <button 
+     name="btn_add"
      layout="topleft"
      follows="top|right"
+     image_overlay="AddItem_Off"
      top="0"
      left="0"
      height="23"
-     width="26"
-     tab_stop="false">
-      <button 
-       name="btn_add"
-       layout="topleft"
-       follows="top|right"
-       image_overlay="AddItem_Off"
-       top="0"
-       left="0"
-       height="23"
-       width="23"
-       tab_stop="false"
-       tool_tip="Add more items of this type" />
-    </panel>
+     width="23"
+     tab_stop="false" />
     <icon
      follows="left|right|top"
      height="3"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
index 9fb777e0e7..8604f42e75 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -1,437 +1,424 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- bevel_style="in"
+	bevel_style="in"
  follows="all"
  height="570"
- help_topic="edit_wearable"
  label="Wearable"
  layout="topleft"
- left="0"
+left="0"
  name="panel_edit_wearable"
- top="0"
+	top="0"
  width="333">
-    <string
-     name="edit_shape_title">
-        Editing Shape
-    </string>
-    <string
-     name="edit_skin_title">
-        Editing Skin
-    </string>
-    <string
-     name="edit_hair_title">
-        Editing Hair
-    </string>
-    <string
-     name="edit_eyes_title">
-        Editing Eyes
-    </string>
-    <string
-     name="edit_shirt_title">
-        Editing Shirt
-    </string>
-    <string
-     name="edit_pants_title">
-        Editing Pants
-    </string>
-    <string
-     name="edit_shoes_title">
-        Editing Shoes
-    </string>
-    <string
-     name="edit_socks_title">
-        Editing Socks
-    </string>
-    <string
-     name="edit_jacket_title">
-        Editing Jacket
-    </string>
-    <string
-     name="edit_skirt_title">
-        Editing Skirt
-    </string>
-    <string
-     name="edit_gloves_title">
-        Editing Gloves
-    </string>
-    <string
-     name="edit_undershirt_title">
-        Editing Undershirt
-    </string>
-    <string
-     name="edit_underpants_title">
-        Editing Underpants
-    </string>
-    <string
-     name="edit_alpha_title">
-        Editing Alpha Mask
-    </string>
-    <string
-     name="edit_tattoo_title">
-        Editing Tattoo
-    </string>
-    <string
-     name="shape_desc_text">
-        Shape:
-    </string>
-    <string
-     name="skin_desc_text">
-        Skin:
-    </string>
-    <string
-     name="hair_desc_text">
-        Hair:
-    </string>
-    <string
-     name="eyes_desc_text">
-        Eyes:
-    </string>
-    <string
-     name="shirt_desc_text">
-        Shirt:
-    </string>
-    <string
-     name="pants_desc_text">
-        Pants:
-    </string>
-    <string
-     name="shoes_desc_text">
-        Shoes:
-    </string>
-    <string
-    name="socks_desc_text">
-        Socks:
-    </string>
-    <string
-     name="jacket_desc_text">
-        Jacket:
-    </string>
-    <string
-     name="skirt_desc_text">
-        Skirt:
-    </string>
-    <string
-    name="gloves_desc_text">
-        Gloves:
-    </string>
-    <string
-     name="undershirt_desc_text">
-        Undershirt:
-    </string>
-    <string
-     name="underpants_desc_text">
-        Underpants:
-    </string>
-    <string
-     name="alpha_desc_text">
-        Alpha Mask:
-    </string>
-    <string
-     name="tattoo_desc_text">
-        Tattoo:
-    </string>
-    <!-- Default width of the button should be to show it without label.
-     Button will be extedned in code to show whole label when wearable is being changed.
-    -->
-    <labeled_back_button
+	<string
+		name="edit_shape_title">
+		Editing Shape
+	</string>
+	<string
+		name="edit_skin_title">
+		Editing Skin
+	</string>
+	<string
+		name="edit_hair_title">
+		Editing Hair
+	</string>
+	<string
+		name="edit_eyes_title">
+		Editing Eyes
+	</string>
+	<string
+		name="edit_shirt_title">
+		Editing Shirt
+	</string>
+	<string
+		name="edit_pants_title">
+		Editing Pants
+	</string>
+	<string
+		name="edit_shoes_title">
+		Editing Shoes
+	</string>
+	<string
+		name="edit_socks_title">
+		Editing Socks
+	</string>
+	<string
+		name="edit_jacket_title">
+		Editing Jacket
+	</string>
+	<string
+		name="edit_skirt_title">
+		Editing Skirt
+	</string>
+	<string
+		name="edit_gloves_title">
+		Editing Gloves
+	</string>
+	<string
+		name="edit_undershirt_title">
+		Editing Undershirt
+	</string>
+	<string
+		name="edit_underpants_title">
+		Editing Underpants
+	</string>
+	<string
+		name="edit_alpha_title">
+		Editing Alpha Mask
+	</string>
+	<string
+		name="edit_tattoo_title">
+		Editing Tattoo
+	</string>
+	<string
+		name="shape_desc_text">
+		Shape:
+	</string>
+	<string
+		name="skin_desc_text">
+		Skin:
+	</string>
+	<string
+		name="hair_desc_text">
+		Hair:
+	</string>
+	<string
+		name="eyes_desc_text">
+		Eyes:
+	</string>
+	<string
+		name="shirt_desc_text">
+		Shirt:
+	</string>
+	<string
+		name="pants_desc_text">
+		Pants:
+	</string>
+	<string
+		name="shoes_desc_text">
+		Shoes:
+	</string>
+	<string
+		name="socks_desc_text">
+		Socks:
+	</string>
+	<string
+		name="jacket_desc_text">
+		Jacket:
+	</string>
+	<string
+		name="skirt_desc_text">
+		Skirt:
+	</string>
+	<string
+		name="gloves_desc_text">
+		Gloves:
+	</string>
+	<string
+		name="undershirt_desc_text">
+		Undershirt:
+	</string>
+	<string
+		name="underpants_desc_text">
+		Underpants:
+	</string>
+	<string
+		name="alpha_desc_text">
+		Alpha Mask:
+	</string>
+	<string
+		name="tattoo_desc_text">
+		Tattoo:
+	</string>
+    <button
      follows="top|left"
      height="24"
+     width="30"
      image_hover_unselected="BackButton_Over"
      image_pressed="BackButton_Press"
      image_unselected="BackButton_Off"
      layout="topleft"
-     label="Save"
-     left="11"
      name="back_btn"
-     pad_left="24"
-     tool_tip="Return to Edit Outfit"
-     top="3"
-     width="30" />
-    <text
-     follows="top|left|right"
-     font="SansSerifHugeBold"
-     height="22"
-     layout="topleft"
-     left_pad="8"
-     name="edit_wearable_title"
-     text_color="white"
-     top="3"
-     value="Editing Shape"
-     use_ellipses="true"
-     width="274" />
-    <panel
-     background_opaque="true"
-     background_visible="true"
-     bg_alpha_color="DkGray2"
-     bg_opaque_color="DkGray2"
-     border="false"
-     follows="top|left|right"
-     height="60"
-     label="Shirt"
-     layout="topleft"
-     left="10"
-     name="wearable_type_panel"
-     top_pad="10"
-     width="313">
-        <text
+     left="11"
+     top="7" />
+	<text
+	 follows="top|left"
+	 font="SansSerifHugeBold"
+	 height="22"
+	 layout="topleft"
+	 left_pad="15"
+	 name="edit_wearable_title"
+	 text_color="white"
+	 value="Editing Shape"
+	 width="270" />
+     <panel
+         border="false"
+         bg_alpha_color="DkGray2"
+         bg_opaque_color="DkGray2"
+         background_visible="true"
+         background_opaque="true"
          follows="top|left|right"
-         font="SansSerifSmallBold"
-         height="16"
-         layout="topleft"
-         left="10"
-         name="description_text"
-         text_color="white"
-         top="10"
-         value="Shape:"
-         width="150" />
-        <radio_group
-         control_name="AvatarSex"
-         follows="left|top|right"
-         height="20"
-         layout="topleft"
-         left="210"
-         name="sex_radio"
-         top="5"
-         width="110">
-            <radio_item
-             follows="all"
-             height="16"
-             label=""
-             layout="topleft"
-             left="0"
-             name="sex_male"
-             tool_tip="Male"
-             value="1"
-             width="40" />
-            <radio_item
-             follows="all"
-             height="16"
-             label=""
-             layout="topleft"
-             left_pad="10"
-             name="sex_female"
-             tool_tip="Female"
-             value="0"
-             width="40"/>
-        </radio_group>
-        <!--  graphical labels for the radio buttons above -->
-        <icon
-         height="16"
-         image_name="icons/Male.png"
-         layout="topleft"
-         left="230"
-         name="male_icon"
-         tool_tip="Male"
-         top="7"
-         width="16" />
-        <icon
-         height="16"
-         image_name="icons/Female.png"
+         height="60"
+         label="Shirt"
          layout="topleft"
-         left="280"
-         name="female_icon"
-         tool_tip="Female"
-         top="7"
-         width="16" />
-        <line_editor
-         follows="all"
-         height="23"
-         layout="topleft"
-         left="10"
-         max_length="63"
-         name="description"
-         prevalidate_callback="ascii"
-         select_on_focus="true"
-         text_color="black"
-         top_pad="3"
-         width="290" />
-    </panel>
-    <panel
-     follows="all"
-     height="433"
-     layout="topleft"
-     left="0"
-     name="edit_subpanel_container"
-     top_pad="2"
-     width="333">
-    <!-- the shape editing panel is taller than the others
+		 left="10"
+         name="wearable_type_panel"
+		 top_pad="10"
+         width="313">
+		 <text
+		 follows="top|left|right"
+		 font="SansSerifSmallBold"
+		 height="16"
+		 layout="topleft"
+		 left="10"
+		 name="description_text"
+		 text_color="white"
+		 top="10"
+		 value="Shape:"
+		 width="150" />
+		 <radio_group
+			 control_name="AvatarSex"
+			 follows="left|top|right"
+			 left="210"
+			 height="20"
+			 layout="topleft"
+			 name="sex_radio"
+			 top="5"
+			 width="110">
+			 <radio_item
+				 follows="all"
+				 height="16"
+				 label=""
+				 layout="topleft"
+				 left="0"
+				 name="sex_male"
+				 tool_tip="Male"
+				 value="1"
+				 width="40" />
+			 <radio_item
+				 follows="all"
+				 height="16"
+				 label=""
+				 layout="topleft"
+				 left_pad="10"
+				 name="sex_female"
+				 tool_tip="Female"
+				 value="0"
+				 width="40" />
+		 </radio_group>
+		 <!--  graphical labels for the radio buttons above -->
+		 <icon
+			 height="16"
+			 image_name="icons/Male.png"
+			 left="230"
+			 name="male_icon"
+			 tool_tip="Male"
+			 top="7"
+			 width="16" />
+		 <icon
+			 height="16"
+			 image_name="icons/Female.png"
+			 name="female_icon"
+			 left="280"
+			 tool_tip="Female"
+			 top="7"
+			 width="16" />
+		 <text_editor
+			 follows="all"
+			 height="23"
+			 left="10"
+			 layout="topleft"
+			 max_length="300"
+			 name="description"
+			 top_pad="3"
+			 width="290" />
+	 </panel>
+	 <panel
+		 follows="all"
+		 height="433"
+		 layout="topleft"
+		 left="0"
+		 name="edit_subpanel_container"
+		 top_pad="2"
+		 width="333">
+		 <!-- the shape editing panel is taller than the others
 		      because it also displays avatar height -->
-        <panel
-         filename="panel_edit_shape.xml"
-         follows="all"
-         height="433"
-         layout="topleft"
-         left="0"
-         name="edit_shape_panel"
-         top="0"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_skin.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_skin_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_hair.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_hair_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_eyes.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_eyes_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_shirt.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_shirt_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_pants.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_pants_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_shoes.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_shoes_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_socks.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_socks_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_jacket.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_jacket_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_skirt.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_skirt_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_gloves.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_gloves_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_undershirt.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_undershirt_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_underpants.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_underpants_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_alpha.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_alpha_panel"
-         top="8"
-         visible="false"
-         width="333" />
-        <panel
-         filename="panel_edit_tattoo.xml"
-         follows="all"
-         height="425"
-         layout="topleft"
-         left="0"
-         name="edit_tattoo_panel"
-         top="8"
-         visible="false"
-         width="333" />
-    </panel>
-    <panel
-     follows="bottom|left|right"
-     height="23"
-     layout="topleft"
-     left="2"
-     name="button_panel"
-     top_pad="6"
-     width="333">
-        <button
-         follows="bottomleft"
-         height="23"
-         label="Save As"
-         layout="topleft"
-         left="8"
-         name="save_as_button"
-         top="0"
-         width="153" />
-        <button
-         follows="bottomleft"
-         height="23"
-         label="Undo Changes"
-         layout="topleft"
-         left_pad="7"
-         name="revert_button"
-         width="152" />
-    </panel>
+		 <panel
+			 filename="panel_edit_shape.xml"
+			 follows="all"
+			 height="433"
+			 layout="topleft"
+			 left="0"
+			 name="edit_shape_panel"
+			 top="0"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_skin.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_skin_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_hair.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_hair_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_eyes.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_eyes_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_shirt.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_shirt_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_pants.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_pants_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_shoes.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_shoes_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_socks.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_socks_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_jacket.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_jacket_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_skirt.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_skirt_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_gloves.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_gloves_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_undershirt.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_undershirt_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_underpants.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_underpants_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_alpha.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_alpha_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+		 <panel
+			 filename="panel_edit_tattoo.xml"
+			 follows="all"
+			 height="425"
+			 layout="topleft"
+			 left="0"
+			 name="edit_tattoo_panel"
+			 top="8"
+			 visible="false"
+			 width="333" />
+	 </panel>
+
+	 <panel
+		 follows="bottom|left|right"
+		 height="23"
+		 layout="topleft"
+		 left="2"
+		 name="button_panel"
+		 top_pad="6"
+		 width="333" >
+		 <button
+			 follows="bottomleft"
+			 layout="topleft"
+			 height="23"
+			 label="Save As"
+			 left="8"
+			 name="save_as_button"
+			 top="0"
+			 width="153" />
+		 <button
+			 follows="bottomleft"
+			 layout="topleft"
+			 height="23"
+			 label="Revert"
+			 left_pad="7"
+			 name="revert_button"
+			 width="152" />
+	 </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index cf174da2f0..feee532320 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -6,7 +6,6 @@
  height="600"
  follows="all"
  layout="topleft"
- help_topic="edit_outfit"
  left="0"
  min_height="350"
  name="outfit_edit"
@@ -51,12 +50,7 @@
     <string name="Filter.All" value="All"/>
     <string name="Filter.Clothes/Body" value="Clothes/Body"/>
     <string name="Filter.Objects" value="Objects"/>
-    <string name="Filter.Clothing" value="Clothing"/>
-    <string name="Filter.Bodyparts" value="Body parts"/>
 
-    <string
-     name="replace_body_part"
-     value="Click to replace your existing shape"/>
 
     <button
      follows="top|left"
@@ -68,14 +62,14 @@
      name="back_btn"
      left="5"
      tab_stop="false"
-     top="1"
+     top="2"
      width="30" />
     <text
      follows="top|right"
      font="SansSerifHugeBold"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left_pad="20"
      name="title"
      text_color="LtGray"
      top="0"
@@ -109,7 +103,7 @@
             <panel
              bevel_style="none"
              follows="top|right"
-             height="37"
+             height="38"
              layout="topleft"
              left_pad="5"
              name="outfit_name_and_status"
@@ -125,26 +119,18 @@
                  top="2"
                  value="Now editing..."
                  use_ellipses="true"
-                 width="245" /> 
+                 width="270" /> 
                 <text
                  follows="bottom|left|right"
                  font="SansSerifLargeBold"
-                 height="18"
+                 height="26"
                  layout="topleft"
                  name="curr_outfit_name"
                  text_color="LtGray"
                  top_pad="2"
                  value="[Current Outfit]"
                  use_ellipses="true"
-                 width="245" /> 
-                <loading_indicator
-                 follows="right|top"
-                 height="24"
-                 layout="topleft"
-                 right="-2"
-                 name="edit_outfit_loading_indicator"
-                 top="6"
-                 width="24" />
+                 width="270" /> 
             </panel>
     </panel>
 
@@ -155,7 +141,7 @@ Required height for dragbar (icon in spec) is 10, so resizebar height should be
 It is calculated as border_size + 2*UIResizeBarOverlap
 -->
     <layout_stack
-     animate="true"
+     animate="false"
      border_size="8"
      clip="false"
      default_tab_group="2"
@@ -171,7 +157,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
         <layout_panel
          layout="topleft"
          height="187"
-         min_height="155"
+         min_height="100"
          name="outfit_wearables_panel"
          width="313"
          auto_resize="true"
@@ -189,7 +175,8 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              left="0">
                 <layout_panel
                  auto_resize="true" 
-                 background_visible="false"
+                 background_visible="true"
+                 bg_alpha_color="DkGray2"
                  layout="topleft"
                  height="154"
                  name="add_button_and_combobox"
@@ -222,7 +209,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                      left="2"
                      name="show_add_wearables_btn"
                      top_pad="2"
-                     tool_tip="Open/Close"
                      width="125" />
 
                     <combo_box
@@ -230,20 +216,11 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                      height="22"
                      layout="topleft"
                      left_pad="5"
-                     name="list_view_filter_combobox"
+                     name="filter_wearables_combobox"
                      top_delta="0"
                      visible="false"
                      width="152"/>
-                    <combo_box
-                     follows="left|right|bottom"
-                     height="22"
-                     layout="topleft"
-                     left_delta="0"
-                     name="folder_view_filter_combobox"
-                     top_delta="0"
-                     visible="false"
-                     width="152"/>
-                    
+
                     <button
                      follows="bottom|right"
                      height="22"
@@ -290,12 +267,12 @@ It is calculated as border_size + 2*UIResizeBarOverlap
 
 
         <layout_panel
-         background_visible="false"
+         background_visible="true"
          bg_alpha_color="DkGray2"
          auto_resize="true"
          default_tab_group="3"
-         height="450"
-         min_height="53"
+         height="211"
+         min_height="210"
          name="add_wearables_panel"
          width="313"
          tab_group="2"
@@ -317,13 +294,13 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              background_visible="false"
              border="false"
              follows="left|top|right|bottom"
-             height="418"
+             height="203"
              layout="topleft"
              left="0"
              mouse_opaque="false"
-             name="folder_view"
-             top_pad="0"
-             width="313"
+             name="inventory_items"
+             top_pad="5"
+             width="310"
              visible="false"/>
             <panel
              name="filtered_wearables_panel"
@@ -332,7 +309,7 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              layout="topleft"
              follows="left|top|right|bottom"
              border="false"
-             height="418"
+             height="210"
              left="0"
              mouse_opaque="false"
              width="310"
@@ -340,25 +317,16 @@ It is calculated as border_size + 2*UIResizeBarOverlap
              visible="true">
                 <wearable_items_list
                  color="0.107 0.107 0.107 1"
-                 name="list_view"
+                 name="filtered_wearables_list"
                  allow_select="true"
                  layout="topleft"
                  follows="all"
                  multi_select="true"
-                 width="313"
-                 height="418"
+                 width="310"
+                 height="210"
                  left="0"
                  top="0"/>
             </panel>
-            <button
-	         follows="bottom|left"
-	         height="22"
-	         left="2"
-	         label="Wear Item"
-	         layout="topleft"
-	         name="plus_btn"
-	         top_pad="5"
-	         width="130" />
 
         </layout_panel>
     </layout_stack>
@@ -390,24 +358,11 @@ It is calculated as border_size + 2*UIResizeBarOverlap
         <icon
          follows="bottom|left|right"
          height="25"
-         image_name="Toolbar_Middle_Off"
+         image_name="Toolbar_Right_Off"
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="250" />
-        <button
-         follows="bottom|right"
-         height="25"
-         image_hover_unselected="Toolbar_Right_Over"
-         image_overlay="Shop"
-         image_selected="Toolbar_Right_Selected"
-         image_unselected="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="shop_btn_1"
-         top="1"
-         tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
-         width="31" />
+         width="281" />
     </panel>
     
     
@@ -461,28 +416,28 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          name="list_view_btn"
          top="1"
          width="31" />
+        <button
+         follows="bottom|left"
+         height="25"
+         image_hover_unselected="Toolbar_Middle_Over"
+         image_overlay="AddItem_Off"
+         image_selected="Toolbar_Middle_Selected"
+         image_unselected="Toolbar_Middle_Off"
+         label=""
+         layout="topleft"
+         left_pad="1"
+         name="add_to_outfit_btn"
+         top="1"
+         width="31" />
         <icon
          follows="bottom|left|right"
          height="25"
-         image_name="Toolbar_Middle_Off"
+         image_name="Toolbar_Right_Off"
          layout="topleft"
          left_pad="1"
          name="dummy_right_icon"
-         width="186" >
+         width="184" >
         </icon>
-        <button
-         follows="bottom|right"
-         height="25"
-         image_hover_unselected="Toolbar_Right_Over"
-         image_overlay="Shop"
-         image_selected="Toolbar_Right_Selected"
-         image_unselected="Toolbar_Right_Off"
-         layout="topleft"
-         left_pad="1"
-         name="shop_btn_2"
-         top="1"
-         tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"
-         width="31" />
     </panel>
     
     <!-- SAVE AND REVERT BUTTONS -->
@@ -522,11 +477,10 @@ It is calculated as border_size + 2*UIResizeBarOverlap
          follows="bottom|left|right"
          height="23"
          left_pad="12"
-         label="Undo Changes"
+         label="Revert"
          layout="topleft"
          name="revert_btn"
          top="0"
-         tool_tip="Revert to last saved version"
          width="147" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index d18f0d57ca..5c9ae51a48 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -4,69 +4,23 @@
    bg_alpha_color="DkGray"
    border="false"
    follows="all"
-   height="430"
+   height="400"
    name="Outfits"
    layout="topleft"
    left="0"
    top="0"
-   width="312">
+   width="313">
     <accordion
      background_visible="true"
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
-     no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
-     no_matched_tabs_text.v_pad="10"
-     no_visible_tabs_text.value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"
+     empty_accordion_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
      follows="all"
      height="400"
      layout="topleft"
      left="3"
      name="outfits_accordion"
      top="0"
-     width="309">
+     width="307">
     </accordion>
-    <panel
-     background_visible="true"
-	 follows="bottom|left|right"
-	 height="28"
-	 layout="topleft"
-	 left="4"
-	 top_pad="0"
-	 visible="true"
-	 name="bottom_panel"
-	 width="312">
-     <button
-       follows="bottom|left"
-       tool_tip="Show additional options"
-       height="25"
-       image_hover_unselected="Toolbar_Left_Over"
-       image_overlay="OptionsMenu_Off"
-       image_selected="Toolbar_Left_Selected"
-       image_unselected="Toolbar_Left_Off"
-       layout="topleft"
-       left="0"
-       name="options_gear_btn"
-       top="1"
-       width="31" />
-     <icon
-       follows="bottom|left|right"
-       height="25"
-       image_name="Toolbar_Middle_Off"
-       layout="topleft"
-       left_pad="1"
-       name="dummy_icon"
-       width="243"/>
-      <button
-       follows="bottom|right"
-       height="25"
-       image_hover_unselected="Toolbar_Right_Over"
-       image_overlay="TrashItem_Off"
-       image_selected="Toolbar_Right_Selected"
-       image_unselected="Toolbar_Right_Off"
-       layout="topleft"
-       left_pad="1"
-       name="trash_btn"
-       tool_tip="Delete selected outfit"
-       width="31"/>
-    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7cd0d5b5f0..da28773c74 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -95,6 +95,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          width="313">
             <avatar_list
              allow_select="true"
+       		 bg_alpha_color="DkGray2"
+             bg_opaque_color="DkGray2"
              follows="all"
              height="356"
              ignore_online_status="true"
@@ -171,6 +173,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
        		 background_visible="true"
        		 bg_alpha_color="DkGray2"
        		 bg_opaque_color="DkGray2"
+             empty_accordion_text.value=""
              follows="all"
              height="356"
              layout="topleft"
@@ -298,11 +301,16 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
     -->
             <group_list
              allow_select="true" 
+             background_visible="true"
+             bg_alpha_color="DkGray2"
+             bg_opaque_color="DkGray2"
              follows="all"
              height="356"
              layout="topleft"
              left="3"
              name="group_list"
+             no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]"
+             no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]"
              top="0"
              width="307" />
             <panel
@@ -379,6 +387,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          width="313">
             <avatar_list
              allow_select="true"
+       		 background_visible="true"
+       		 bg_alpha_color="DkGray2"
+             bg_opaque_color="DkGray2"
              follows="all"
              height="356"
              layout="topleft"
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 35e8075896..59f1f6d638 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -160,7 +160,7 @@
      image_pressed="BackButton_Press"
      image_unselected="BackButton_Off"
      layout="topleft"
-     left="8"
+     left="7"
      name="back_btn"
      tool_tip="Back"
      tab_stop="false"
@@ -174,7 +174,7 @@
      left_pad="10"
      name="title"
      text_color="LtGray"
-     top="4"
+     top="2"
      use_ellipses="true"
      value="Place Profile"
      width="280" />
@@ -200,8 +200,7 @@
          width="310">
             <texture_picker
              enabled="false"
-             fallback_image="default_land_picture.j2c"
-             follows="left|top|right"
+         follows="left|top|right"
              height="197"
              layout="topleft"
              left="11"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f4694180a1..d046fed2e9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -155,7 +155,7 @@
 	 visiblity_control="ShowAdvancedGraphicsSettings"
      border="false"
 	 follows="top|left"
-     height="260"
+     height="283"
      label="CustomGraphics"
      layout="topleft"
      left="5"
@@ -211,119 +211,112 @@
 			<check_box.commit_callback
 			function="Pref.VertexShaderEnable" />
 		</check_box>
-		<check_box
-		control_name="RenderWaterReflections"
+<!-- DISABLED UNTIL WE REALLY WANT TO SUPPORT THIS
+    <check_box
+		control_name="RenderDeferred"
 		height="16"
 		initial_value="true"
-		label="Water reflections"
+		label="Lighting and Shadows"
 		layout="topleft"
 		left_delta="0"
-		name="Reflections"
+		name="UseLightShaders"
 		top_pad="1"
 		width="256">
-			<check_box.commit_callback
+      <check_box.commit_callback
 			function="Pref.VertexShaderEnable" />
-		</check_box>
-		<text
-		type="string"
-		length="1"
-		follows="left|top"
-		height="12"
-		layout="topleft"
-		left_delta="0"
-		name="ReflectionDetailText"
-		top_pad="7"
-		width="128">
-			Reflection detail:
-		</text>
-		<radio_group
-		control_name="RenderReflectionDetail"
-		draw_border="false"
-		height="70"
-		layout="topleft"
-		left_delta="-2"
-		name="ReflectionDetailRadio"
-		top_pad="3"
-		width="321">
-			<radio_item
-			height="16"
-			label="Terrain and trees"
-			layout="topleft"
-			left="3"
-			name="0"
-			top="3"
-			width="315" />
-			<radio_item
-			height="16"
-			label="All static objects"
-			layout="topleft"
-			left_delta="0"
-			name="1"
-			top_delta="16"
-			width="315" />
-			<radio_item
-			height="16"
-			label="All avatars and objects"
-			layout="topleft"
-			left_delta="0"
-			name="2"
-			top_delta="16"
-			width="315" />
-			<radio_item
-			height="16"
-			label="Everything"
-			layout="topleft"
-			left_delta="0"
-			name="3"
-			top_delta="16"
-			width="315" />
-		</radio_group>
-		<text
-		type="string"
-		length="1"
-		follows="left|top"
-		height="12"
-		layout="topleft"
-		left_delta="2"
-		name="AvatarRenderingText"
-		top_pad="5"
-		width="158">
-			Avatar rendering:
-		</text>
-		<check_box
-		control_name="RenderUseImpostors"
-		height="16"
-		initial_value="true"
-		label="Avatar impostors"
-		layout="topleft"
-		left_delta="0"
-		name="AvatarImpostors"
-		top_pad="7"
-		width="256" />
-		<check_box
-		control_name="RenderAvatarVP"
+    </check_box>
+    <check_box
+		control_name="RenderDeferredSSAO"
 		height="16"
 		initial_value="true"
-		label="Hardware skinning"
+		label="Ambient Occlusion"
 		layout="topleft"
 		left_delta="0"
-		name="AvatarVertexProgram"
+		name="UseSSAO"
 		top_pad="1"
 		width="256">
-			<check_box.commit_callback
+      <check_box.commit_callback
 			function="Pref.VertexShaderEnable" />
-		</check_box>
-		<check_box
-		control_name="RenderAvatarCloth"
-		height="16"
-		initial_value="true"
-		label="Avatar cloth"
-		layout="topleft"
-		left_delta="0"
-		name="AvatarCloth"
-		top_pad="1"
-		width="256" />
+    </check_box>
 
+     <text
+    type="string"
+    length="1"
+    top_pad="8"
+    follows="top|left"
+    height="23"
+    width="110"
+    word_wrap="true"
+    layout="topleft"
+    left="10"
+    name="shadows_label">
+        Shadows:
+      </text>
+      <combo_box
+      control_name="RenderShadowDetail"
+      height="23"
+      layout="topleft"
+      left="10"
+      top_pad="0" 
+      name="ShadowDetail"
+      width="150">
+        <combo_box.item
+        label="None"
+        name="0"
+        value="0"/>
+        <combo_box.item
+        label="Sun/Moon"
+        name="1"
+        value="1"/>
+        <combo_box.item
+        label="Sun/Moon + Projectors"
+        name="2"
+        value="2"/>
+      </combo_box>
+-->
+      <text
+  type="string"
+  length="1"
+  top_pad="8"
+  follows="top|left"
+  height="23"
+  width="110"
+  word_wrap="true"
+  layout="topleft"
+  left="10"
+  name="reflection_label">
+        Water Reflections:
+      </text>
+      <combo_box
+      control_name="RenderReflectionDetail"
+      height="23"
+      layout="topleft"
+      left_="10"
+      top_pad ="0"
+      name="Reflections"
+      width="150">
+        <combo_box.item
+        label="Minimal"
+        name="0"
+        value="0"/>
+        <combo_box.item
+        label="Terrain and trees"
+        name="1"
+        value="1"/>
+        <combo_box.item
+        label="All static objects"
+        name="2"
+        value="2"/>
+        <combo_box.item
+        label="All avatars and objects"
+        name="3"
+        value="3"/>
+        <combo_box.item
+        label="Everything"
+        name="4"
+        value="4"/>
+      </combo_box>
+    
 		<slider
 		control_name="RenderFarClip"
 		decimal_digits="0"
@@ -372,17 +365,29 @@
     decimal_digits="0"
     follows="left|top"
     height="16"
-    increment="1"
-    initial_value="12"
-    label="Max. # of non-impostor avatars:"
+    increment="2"
+    initial_value="35"
+    label="Max. avatar draw distance:"
     label_width="185"
     layout="topleft"
     left_delta="0"
     max_val="65"
     min_val="1"
-    name="MaxNumberAvatarDrawn"
+    name="MaxAvatarDrawDistance"
     top_pad="4"
     width="290" />
+    <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="12"
+    layout="topleft"
+    left_delta="291"
+    name="DrawDistanceMeterText3"
+    top_delta="0"
+    width="128">
+      m
+    </text>
 		<slider
 		control_name="RenderGlowResolutionPow"
 		decimal_digits="0"
@@ -615,49 +620,58 @@
         width="128">
            Low
         </text>
-        <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="12"
-        layout="topleft"
-        left="200"
-        name="LightingDetailText"
+      <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="12"
+      layout="topleft"
+      left_delta="-260"
+      name="AvatarRenderingText"
         top_pad="18"
-        width="140">
-           Lighting detail:
-        </text>
-        <radio_group
-        control_name="RenderLightingDetail"
-        draw_border="false"
-        height="38"
-        layout="topleft"
-        name="LightingDetailRadio"
-        top_pad="5"
-        width="200">
-           <radio_item
-            height="16"
-            label="Sun and moon only"
-            layout="topleft"
-            name="SunMoon"
-            value="0"
-            top="3"
-            width="156" />
-           <radio_item
-            height="16"
-            label="Nearby local lights"
-            layout="topleft"
-            name="LocalLights"
-            value="1"
-            top_delta="16"
-            width="156" />
-        </radio_group>
+      width="128">
+        Avatar rendering:
+      </text>
+      <check_box
+      control_name="RenderUseImpostors"
+      height="16"
+      initial_value="true"
+      label="Avatar impostors"
+      layout="topleft"
+      left_delta="0"
+      name="AvatarImpostors"
+      top_pad="7"
+      width="256" />
+      <check_box
+      control_name="RenderAvatarVP"
+      height="16"
+      initial_value="true"
+      label="Hardware skinning"
+      layout="topleft"
+      left_delta="0"
+      name="AvatarVertexProgram"
+      top_pad="1"
+      width="256">
+        <check_box.commit_callback
+        function="Pref.VertexShaderEnable" />
+      </check_box>
+      <check_box
+      control_name="RenderAvatarCloth"
+      height="16"
+      initial_value="true"
+      label="Avatar cloth"
+      layout="topleft"
+      left_delta="0"
+      name="AvatarCloth"
+      top_pad="1"
+      width="256" />
         <text
         type="string"
         length="1"
         follows="left|top"
         height="12"
         layout="topleft"
+        left="358"
         left_pad="-30"
         name="TerrainDetailText"
         top="226"
@@ -687,7 +701,7 @@
             name="2"
             top_delta="16"
             width="50" />
-        </radio_group>
+        </radio_group> -->
 	</panel>
 	
         <button
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 02ab0ffee5..ae08a13793 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -21,9 +21,6 @@ width="333">
    <string
    name="Now Wearing"
    value="Now wearing..." />
-   <string
-   name="Changing outfits"
-   value="Changing outfits" />
    <panel
    background_opaque="true"
    background_visible="true"
@@ -52,16 +49,16 @@ width="333">
       visible="false" />
       <icon
       follows="top|left"
-      height="31"
-      image_name="Shirt_Large"
+      height="32"
+      image_name="TabIcon_Appearance_Off"
       name="outfit_icon"
       mouse_opaque="false"
       visible="true"
-      left="1"
+      left="0"
       top="0"
-      width="31" />
+      width="32" />
       <text
-      font="SansSerifSmall"
+      font="SansSerifSmallBold"
       text_color="EmphasisColor"
       width="300"
       height="10"
@@ -89,15 +86,14 @@ width="333">
       </text>
       <button
       follows="left|top"
-      height="28"
+      height="23"
       image_overlay="Edit_Wrench"
       label=""
       layout="topleft"
       left="265"
       name="edit_outfit_btn"
-      tool_tip="Edit this outfit"
-      top="3"
-      width="28" />
+      top="7"
+      width="30" />
       <loading_indicator
       follows="left|top"
       height="24"
@@ -148,7 +144,7 @@ width="333">
    left="5"
    min_height="410"
    name="panel_outfit_edit"
-   top="2"
+   top="5"
    visible="false" 
    width="320"/>
    <panel
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
index 1a66f0f5c5..b817ba56ca 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -3,22 +3,13 @@
  height="100"
  name="accordion"
  width="200">
-  <!-- It is possible to override attributes of "no_matched_tabs_text" and "no_visible_tabs_text" with a short form:
-    no_matched_tabs_text.value="Overridden text" (placed among <accordion> attributes)
-    But unfortunatly such form is not supported by VLT Tool. It requires to have the overridden "value"
-    attribute declared in tags below ("no_matched_tabs_text" & "no_visible_tabs_text").
-    It looks less clean but we have to use "long" form for these messages to enable automated translation with VLT.
-  -->
-    <no_matched_tabs_text
+    <empty_accordion_text
      follows="all"
      height="100"
      h_pad="10"
-     name="no_matched_tabs_msg"
+     name="no_visible_items_msg"
+     value="There are no visible content here."
      v_pad="15"
      width="200"
      wrap="true "/>
-    <!-- This widget will not be created in viewer. Only its value will be used for empty accordion without filter. -->
-    <no_visible_tabs_text
-     name="no_visible_tabs_msg"
-     visible="false"/>
 </accordion>