Merge

28 files changed, 632 insertions, 418 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 5f28fa6495..3bc78e8a12 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -373,7 +373,8 @@ Leyla Linden               </text>
              left_delta="-199"
              name="For sale to"
              top_delta="20"
-             width="186">
+             use_ellipses="true" 
+             width="340">
                 For sale to: [BUYER]
             </text>
             <text
@@ -409,7 +410,7 @@ Leyla Linden               </text>
              right="-10"
              name="Cancel Land Sale"
              left_pad="5"
-             top_pad="-25"
+             top_pad="-15"
              width="180" />
             <text
              type="string"
@@ -540,7 +541,7 @@ Leyla Linden               </text>
              layout="topleft"
              left_delta="0"
              name="Reclaim Land..."
-             top_delta="-61"
+             top_delta="-50"
              width="180" />
             <button
              enabled="false"
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 999cb9ed97..8c3aa2c9a4 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -5,7 +5,7 @@
  can_minimize="true"
  can_close="false"
  follows="bottom"
- height="152"
+ height="164"
  layout="topleft"
  name="camera_floater"
  help_topic="camera_floater"
@@ -13,7 +13,7 @@
  save_visibility="true"
  save_dock_state="true"
  single_instance="true"
- width="150">
+ width="228">
     <floater.string
      name="rotate_tooltip">
         Rotate Camera Around Focus
@@ -27,16 +27,16 @@
         Move Camera Up and Down, Left and Right
     </floater.string>
     <floater.string
-     name="orbit_mode_title">
-        Orbit
+     name="camera_modes_title">
+        Camera modes
     </floater.string>
     <floater.string
      name="pan_mode_title">
-        Pan
+       Orbit Zoom Pan
     </floater.string>
     <floater.string
-     name="avatar_view_mode_title">
-        Presets
+     name="presets_mode_title">
+        Preset Views
     </floater.string>
     <floater.string
      name="free_mode_title">
@@ -44,39 +44,134 @@
     </floater.string>
     <panel
      border="false"
-     height="110"
+     height="123"
      layout="topleft"
      left="2"
      top="0"
      mouse_opaque="false"
      name="controls"
-     width="148">
-    <joystick_track
-         follows="top|left"
-         height="78"
-         image_selected="Cam_Tracking_In"
-         image_unselected="Cam_Tracking_Out"
+     width="226">
+       <panel
+         color="Transparent"
+         follows="all"
+         height="102"
          layout="topleft"
-         left="45"
-         name="cam_track_stick"
-         quadrant="left"
-         scale_image="false"
-         sound_flags="3"
-         tool_tip="Move camera up and down, left and right"
-         top="22"
-         visible="false"
-         width="78" />
+         left="8"
+         name="preset_views_list"
+         opaque="true"
+         top="24"
+         width="212"
+         visible="false">
+        <panel_camera_item
+          name="front_view">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="front_view" />
+          <panel_camera_item.picture
+            image_name="Cam_Preset_Front_Off" />
+          <panel_camera_item.selected_picture
+            image_name="Cam_Preset_Front_On" />
+          <panel_camera_item.text>
+            Front View
+          </panel_camera_item.text>
+        </panel_camera_item>
+        <panel_camera_item
+          name="group_view"
+          top_pad="4">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="group_view" />
+          <panel_camera_item.picture
+            image_name="Cam_Preset_Side_Off" />
+          <panel_camera_item.selected_picture
+            image_name="Cam_Preset_Side_On" />
+          <panel_camera_item.text>
+            Side View
+          </panel_camera_item.text>
+        </panel_camera_item>
+        <panel_camera_item
+          name="rear_view"
+          layout="topleft"
+          top_pad="4">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="rear_view" />
+          <panel_camera_item.picture
+            image_name="Cam_Preset_Back_Off" />
+          <panel_camera_item.selected_picture
+            image_name="Cam_Preset_Back_On" />
+          <panel_camera_item.text>
+            Rear View
+          </panel_camera_item.text>
+        </panel_camera_item>
+      </panel>
+      <panel
+          color="Transparent"
+          follows="all"
+          height="68"
+          item_pad="4"
+          layout="topleft"
+          left="8"
+          name="camera_modes_list"
+          opaque="true"
+          top="24"
+          width="212"
+          visible="false">
+        <panel_camera_item
+          name="object_view">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="object_view" />
+          <panel_camera_item.text>
+            Object View
+          </panel_camera_item.text>
+          <panel_camera_item.picture
+            image_name="Object_View_Off" />
+          <panel_camera_item.selected_picture
+            image_name="Object_View_On" />
+        </panel_camera_item>
+        <panel_camera_item
+          name="mouselook_view"
+          layout="topleft">
+          <panel_camera_item.mousedown_callback
+            function="CameraPresets.ChangeView"
+            parameter="mouselook_view" />
+          <panel_camera_item.text>
+            Mouselook View
+          </panel_camera_item.text>
+          <panel_camera_item.picture
+            image_name="MouseLook_View_Off" />
+          <panel_camera_item.selected_picture
+            image_name="MouseLook_View_On" />
+        </panel_camera_item>
+      </panel>
          <!--TODO: replace + - images -->
          <panel
             border="false"
             class="camera_zoom_panel"
-            height="94"
+            height="114"
             layout="topleft"
-            left="7"
+            left="0"
             mouse_opaque="false"
             name="zoom"
-            top="22"
-            width="18">
+            top="20"
+            width="226">
+           <joystick_rotate
+              follows="top|left"
+              height="78"
+              image_selected="Cam_Rotate_In"
+              image_unselected="Cam_Rotate_Out"
+              layout="topleft"
+              left="7"
+              mouse_opaque="false"
+              name="cam_rotate_stick"
+              quadrant="left"
+              scale_image="false"
+              sound_flags="3"
+              visible="true"
+              tool_tip="Orbit camera around focus"
+              top="20"
+              width="78" />                      
            <button
               follows="top|left"
               height="18"
@@ -84,15 +179,17 @@
               image_selected="AddItem_Press"
               image_unselected="AddItem_Off"
               layout="topleft"
+              left_pad="14" 
               name="zoom_plus_btn"
-              width="18">
+              width="18"
+              top="18">
              <commit_callback
                 function="Zoom.plus" />
              <mouse_held_callback
                 function="Zoom.plus" />
            </button>
            <slider_bar
-              height="48"
+              height="50"
               layout="topleft"
               name="zoom_slider"
               orientation="vertical"
@@ -118,90 +215,20 @@
              <mouse_held_callback
                 function="Zoom.minus" />
            </button>
-         </panel>
-         <joystick_rotate
+         <joystick_track
          follows="top|left"
          height="78"
-         image_selected="Cam_Rotate_In"
-         image_unselected="Cam_Rotate_Out"
+         image_selected="Cam_Tracking_In"
+         image_unselected="Cam_Tracking_Out"
          layout="topleft"
-         left="45"
-         mouse_opaque="false"
-         name="cam_rotate_stick"
+         left="133"
+         name="cam_track_stick"
          quadrant="left"
          scale_image="false"
          sound_flags="3"
-         visible="true"
-         tool_tip="Orbit camera around focus"
-         top="22"
-         width="78" />
-         <panel
-         height="78"
-         layout="topleft"
-         left="36"
-         name="camera_presets"
+         tool_tip="Move camera up and down, left and right"
          top="20"
-         visible="false"
-         width="78">
-            <button
-             height="40"
-             image_selected="Cam_Preset_Back_On"
-             image_unselected="Cam_Preset_Back_Off"
-             is_toggle="true"
-             layout="topleft"
-             left="0"
-             name="rear_view"
-             tool_tip="Rear View"
-             top="2"
-             width="40">
-                <click_callback
-                 function="CameraPresets.ChangeView"
-                 parameter="rear_view" />
-            </button>
-            <button
-             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"
-             tool_tip="Group View"
-             top="2"
-             width="40">
-                <click_callback
-                 function="CameraPresets.ChangeView"
-                 parameter="group_view" />
-            </button>
-            <button
-             height="40"
-             image_selected="Cam_Preset_Front_On"
-             image_unselected="Cam_Preset_Front_Off"
-             is_toggle="true"
-             layout="topleft"
-             left="0"
-             name="front_view"
-             tool_tip="Front View"
-             top_pad="5"
-             width="40">
-                <click_callback
-                 function="CameraPresets.ChangeView"
-                 parameter="front_view" />
-            </button>
-            <button
-             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"
-             tool_tip="Mouselook View"
-             width="40">
-                <click_callback
-                 function="CameraPresets.ChangeView"
-                 parameter="mouselook_view" />
-            </button>
+         width="78"/>
         </panel>
     </panel>
     <panel
@@ -211,56 +238,44 @@
      left="2"
      top_pad="0"
      name="buttons"
-     width="148">
+     width="226">
         <button
          height="23"
          label=""
          layout="topleft"
-         left="23"
+         left="70"
          is_toggle="true"
-         image_overlay="Cam_Orbit_Off"
+         image_overlay="Cam_Avatar_Off"
          image_selected="PushButton_Selected_Press"
-         name="orbit_btn"
+         name="presets_btn"
          tab_stop="false"
-         tool_tip="Orbit camera"
+         tool_tip="Preset Views"
+         top="13" 
          width="25">
         </button>
         <button
          height="23"
          label=""
          layout="topleft"
-         left_pad="0"
+         left_pad="1"
          is_toggle="true"
-         image_overlay="Cam_Pan_Off"
+         image_overlay="PanOrbit_Off"
          image_selected="PushButton_Selected_Press"
          name="pan_btn"
          tab_stop="false"
-         tool_tip="Pan camera"
-         width="25">
-        </button>
-        <button
-         height="23"
-         label=""
-         layout="topleft"
-         left_pad="0"
-         image_overlay="Cam_Avatar_Off"
-         image_selected="PushButton_Selected_Press"
-         name="avatarview_btn"
-         tab_stop="false"
-         tool_tip="Presets"
+         tool_tip="Orbit Zoom Pan"
          width="25">
         </button>
         <button
          height="23"
          label=""
          layout="topleft"
-         left_pad="0"
-         is_toggle="true"
+         left_pad="1"
          image_overlay="Cam_FreeCam_Off"
          image_selected="PushButton_Selected_Press"
-         name="freecamera_btn"
+         name="avatarview_btn"
          tab_stop="false"
-         tool_tip="View object"
+         tool_tip="Camera modes"
          width="25">
         </button>
     </panel>
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 ced8c29199..e123de46c2 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -27,7 +27,14 @@
      halign="left"
      use_ellipses="true"
      top="0"
-     width="394" />
+     width="394">
+      <first_tab
+       tab_bottom_image_flash="Toolbar_Left_Flash"/>
+      <middle_tab
+       tab_bottom_image_flash="Toolbar_Middle_Flash"/>
+      <last_tab
+       tab_bottom_image_flash="Toolbar_Right_Flash"/>
+    </tab_container>
     <icon
      color="DefaultShadowLight"
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 420ba172e8..81194f61cf 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -32,7 +32,15 @@
     </floater.string>
     <floater.string
      name="VoiceInviteGroup">
-        has joined a Voice Chat call with the group [GROUP].
+      just joined '[GROUP]' voice channel.
+    </floater.string>
+    <floater.string
+     name="VoiceInviteQuestionGroup">
+      Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'?
+    </floater.string>
+    <floater.string
+     name="VoiceInviteQuestionDefault">
+      Do you want to leave [CURRENT_CHAT] and join this voice chat?
     </floater.string>
     <avatar_icon
      enabled="false"
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index b690986e6b..6f29255a6b 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -12,7 +12,7 @@
  save_rect="true"
  save_visibility="true"
  save_dock_state="true"
- width="113">
+ width="133">
     <string
      name="walk_forward_tooltip">
         Walk Forward (press Up Arrow or W)
@@ -98,108 +98,82 @@
      mouse_opaque="false"
      name="panel_actions"
      top="0"
-     width="113">
+     width="133">
         <!-- Buttons in panel are organized in 3 columns to enable their easy vertical adjustment via top_pad-->
         <!-- Left column -->
         <button
          follows="left|bottom"
          height="24"
-         image_selected="Movement_Up_On"
-         image_pressed_selected="Movement_Up_On"
-         image_unselected="Movement_Up_Off"
-         layout="topleft"
-         left="23"
-         name="move up btn"
-         scale_image="false"
-         tool_tip="Fly up (press E)"
-         top="18"
-         width="24" />
-        <button
-         follows="left|bottom"
-         height="24"
          image_selected="Movement_TurnLeft_On"
          image_pressed_selected="Movement_TurnLeft_On"
          image_unselected="Movement_TurnLeft_Off"
          layout="topleft"
-         left="15"
+         left="30"
          name="turn left btn"
          scale_image="false"
          tool_tip="Turn left (press Left Arrow or A)"
-         top_pad="-3"
+         top="34"
          width="24" />
         <joystick_slide
          follows="left|bottom"
-         height="24"
+         height="10"
          image_selected="Movement_Left_On"
          image_pressed_selected="Movement_Left_On"
          image_unselected="Movement_Left_Off"
          layout="topleft"
-         left="18"
+         left_delta="4"
          name="move left btn"
          quadrant="left"
          scale_image="false"
          tool_tip="Walk left (press Shift + Left Arrow or A)"
-         top_pad="-3"
-         width="24" />
+         top_pad="10"
+         width="19" />
         <!-- Right column -->
         <button
          follows="left|bottom"
          height="24"
-         image_selected="Movement_Down_On"
-         image_pressed_selected="Movement_Down_On"
-         image_unselected="Movement_Down_Off"
-         layout="topleft"
-         right="-21"
-         name="move down btn"
-         scale_image="false"
-         tool_tip="Fly down (press C)"
-         top="18"
-         width="24" />
-        <button
-         follows="left|bottom"
-         height="24"
          image_selected="Movement_TurnRight_On"
          image_pressed_selected="Movement_TurnRight_On"
          image_unselected="Movement_TurnRight_Off"
          layout="topleft"
-         right="-13"
+         right="-30"
          name="turn right btn"
          scale_image="false"
          tool_tip="Turn right (press Right Arrow or D)"
-         top_pad="-3"
+         top="34"
          width="24" />
         <joystick_slide
          follows="left|bottom"
-         height="24"
+         height="10"
          image_selected="Movement_Right_On"
          image_pressed_selected="Movement_Right_On"
          image_unselected="Movement_Right_Off"
          layout="topleft"
          name="move right btn"
          quadrant="right"
-         right="-16"
+         right_delta="4"
          scale_image="false"
          tool_tip="Walk right (press Shift + Right Arrow or D)"
-         top_pad="-3"
-         width="24" />
+         top_pad="10"
+         width="19" />
         <!-- Middle column -->
         <joystick_turn
          follows="left|bottom"
-         height="25"
+         height="24"
          image_selected="Movement_Forward_On"
          image_pressed_selected="Movement_Forward_On"
          image_unselected="Movement_Forward_Off"
          layout="topleft"
-         left="46"
+         left="54"
          name="forward btn"
          quadrant="up"
          scale_image="false"
          tool_tip="Walk forward (press up arrow or W)"
-         top="22"
-         width="21" />
+         top="20"
+         width="24" />
         <joystick_turn
          follows="left|bottom"
-         height="25"
+         height="24"
          image_selected="Movement_Backward_On"
          image_pressed_selected="Movement_Backward_On"
          image_unselected="Movement_Backward_Off"
@@ -209,8 +183,35 @@
          quadrant="down"
          scale_image="false"
          tool_tip="Walk backward (press down arrow or S)"
-         top_pad="7"
-         width="21" />
+         top_pad="5"
+         width="24" />
+        <!-- Fly up/down (jump/crouch) buttons -->
+        <button
+         follows="left|bottom"
+         height="19"
+         image_selected="Movement_Up_On"
+         image_pressed_selected="Movement_Up_On"
+         image_unselected="Movement_Up_Off"
+         layout="topleft"
+         right="-11"
+         name="move up btn"
+         scale_image="false"
+         tool_tip="Fly up (press E)"
+         top="22"
+         width="10" />
+        <button
+         follows="left|bottom"
+         height="19"
+         image_selected="Movement_Down_On"
+         image_pressed_selected="Movement_Down_On"
+         image_unselected="Movement_Down_Off"
+         layout="topleft"
+         right_delta="0"
+         name="move down btn"
+         scale_image="false"
+         tool_tip="Fly down (press C)"
+         top_pad="10"
+         width="10" />
     </panel>
 <!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
     <panel
@@ -220,7 +221,7 @@
      left="0"
      name="panel_modes"
      top_pad="0"
-     width="113">
+     width="133">
         <button
          follows="left|bottom"
          height="23"
@@ -229,7 +230,7 @@
 	 label=""
          layout="topleft"
          name="mode_walk_btn"
-         left="10"
+         left="20"
          pad_right="0"
          tool_tip="Walking mode"
          top="2"
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 9ca18d455b..49b3b58113 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -9,6 +9,7 @@
  name="floater_search"
  help_topic="floater_search"
  save_rect="true"
+ save_visibility="true"
  single_instance="true"
  title="FIND"
  width="650">
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 7dcf2aab99..f3d297c303 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -62,6 +62,7 @@
    name="share_to_web" 
    top_delta="0" 
    left="10" 
+   visible="false"
    width="130"/>
   <button
    label="Save to My Inventory" 
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index b8a7222e8e..f629eef475 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -18,8 +18,8 @@
  width="228">
   <string name="Creator">By [CREATOR]</string>
   <string name="CreatorAndOwner">
-by [CREATOR]
-owner [OWNER]
+By [CREATOR]
+Owner [OWNER]
   </string>
   <string name="Price">L$[AMOUNT]</string>
   <string name="PriceFree">Free!</string>
@@ -29,61 +29,52 @@ owner [OWNER]
      allow_html="false"
      follows="all"
      font="SansSerifLarge"
-     height="16"
+     height="30"
      left="8"
      name="object_name"
      text_color="White"
-     top="10"
+     top="6"
      use_ellipses="true"
-     value="Test Object Name That Is Really Long"
+     word_wrap="true"
+     value="Test Object Name That Is actually two lines and Really Long"
      width="220" />
   <text
    follows="all"
-   height="33"
+   height="50"
    left="8"
    name="object_creator"
-   top_pad="0"
+   top_pad="6"
    use_ellipses="true"
    width="220">
     by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
 owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
   </text>
-  <!-- *TODO: Replace this icon -->
-  <icon
-  name="price_icon"
-  image_name="Icon_For_Sale"
-  right="-5"
-  width="16"
-  height="16"
-  top="56"
-  follows="left|top"
-  />
   <text
    follows="all"
    font="SansSerifSmall"
    font.style="BOLD"
-   height="16"
+   height="14"
    halign="right"
-   left="5"
+   right="-5"
    name="price_text"
    text_color="white"
-   top="58"
+   top="60"
    font_shadow="none"
-   width="196">
-L$300,000
+   width="60">
+L$30,000
   </text>
   <text
-   clip_partial="true" 
+   clip_partial="true"
    follows="all"
    font="SansSerifSmall"
-   height="37"
+   height="25"
    left="8"
    name="object_description"
-   top_pad="0"
-   use_ellipses="true" 
+   top="76"
+   use_ellipses="true"
    width="220"
    word_wrap="true">
-This is a really long description for an object being as how it is at least 80 characters in length and maybe more like 120 at this point. Who knows, really?
+This is a really long description for an object being as how it is at least 80 characters in length and so but maybe more like 120 at this point. Who knows, really?
   </text>
   <!-- Overlapping buttons for all default actions.  Show "Buy" if
   for sale, "Sit" if can sit, etc. -->
@@ -91,10 +82,9 @@ This is a really long description for an object being as how it is at least 80 c
    follows="all"
    font="SansSerifSmall"
    height="13"
-   left_delta="0"
    name="object_media_url"
-   bottom_pad="2"
-   width="200"
+   width="220"
+   top_pad="0"
    max_length = "50"
    use_ellipses="true">
    http://www.superdupertest.com
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index e42b88abc3..b2e4a7ad95 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -50,7 +50,7 @@
                name="non_side_tray_view"
                user_resize="false"
                width="500">
-          <world_view bottom="500"
+          <view bottom="500"
                 follows="all"
                 height="500"
                 left="0"
diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
index a8778df7f6..6285bf7417 100644
--- a/indra/newview/skins/default/xui/en/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
@@ -14,9 +14,9 @@
         </menu_item_call>
     <menu_item_call 
      name="save_as_new_outfit" 
-     label="Save As New">
+     label="Save As">
         <menu_item_call.on_click 
-         function="Outfit.SaveAsNew.Action"
+         function="Outfit.SaveAs.Action"
          userdata="" />
     </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3f4cc10697..c7eb90dbff 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3130,10 +3130,10 @@ You are no longer frozen.
   <notification
    icon="alertmodal.tga"
    name="SetDisplayName"
-   type="alertmodal">
-Your new display name will be used for name tags, chat, friends lists, etc. You can also reset it back to your original username. There will be a delay before you can change your display name again, so choose wisely.
+   type="alert">
+The name above your avatar's head is called a [http://wiki.secondlife.com/wiki/Setting_your_display_name display name]. You can change it periodically.
 
-See http://wiki.secondlife.com/wiki/Setting_your_display_name
+Press reset to make it the same as your username.
 
 Change your display name?
     <form name="form">
@@ -3159,22 +3159,18 @@ Change your display name?
   <notification
    icon="alertmodal.tga"
    name="SetDisplayNameSuccess"
-   type="alertmodal">
-Thanks for updating your name!
-
-Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for your name to update in object ownership, scripts, search, etc.
+   type="alert">
+Hi [DISPLAY_NAME]!
 
-See http://wiki.secondlife.com/wiki/Setting_your_display_name
+Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc.
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="SetDisplayNameFailedLockout"
-   type="alertmodal">
-Sorry, you cannot change your display name until:
+   type="alert">
+Sorry, you cannot [http://wiki.secondlife.com/wiki/Setting_your_display_name change your display name] until:
 [TIME]
-
-See http://wiki.secondlife.com/wiki/Setting_your_display_name
   </notification>
 
   <notification
@@ -3531,7 +3527,7 @@ You are not allowed in that region due to your maturity Rating.
    type="alertmodal">
 You are not allowed in that Region due to your maturity Rating preference.
 
-Click &apos;Change Preference&apos; to raise your maturity Rating preference for immediate entry. Doing so will allow you to search for and access [REGIONMATURITY] content. If you wish to change this setting later, you may do so from Me &gt; Preferences &gt; General.
+To enter the desired region, please change your maturity Rating preference. This will allow you to search for and access [REGIONMATURITY] content. To undo any changes, go to Me &gt; Preferences &gt; General.
 	 <form name="form">
       <button
        index="0"
@@ -6211,15 +6207,24 @@ Deed to group failed.
    name="AvatarRezNotification"
    type="notifytip">
 ( [EXISTENCE] seconds alive )
-Avatar '[NAME]' declouded in [TIME] seconds.
+Avatar '[NAME]' declouded after [TIME] seconds.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezSelfBakedDoneNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+You finished baking your outfit after [TIME] seconds.
   </notification>
 
   <notification
    icon="notifytip.tga"
-   name="AvatarRezSelfNotification"
+   name="AvatarRezSelfBakedUpdateNotification"
    type="notifytip">
 ( [EXISTENCE] seconds alive )
-You finished baking your outfit in [TIME] seconds.
+You sent out an update of your appearance after [TIME] seconds.
+[STATUS]
   </notification>
 
 
@@ -6263,6 +6268,37 @@ Avatar '[NAME]' entered appearance mode.
 Avatar '[NAME]' left appearance mode.
   </notification>
 
+    <notification
+   icon="alertmodal.tga"
+   name="NoConnect"
+   type="alertmodal">
+        We're having trouble connecting using [PROTOCOL] [HOSTID].
+        Please check your network and firewall setup.
+        <form name="form">
+            <button
+               default="true"
+               index="0"
+               name="OK"
+               text="OK"/>
+        </form>
+    </notification>
+
+    <notification
+          icon="alertmodal.tga"
+          name="NoVoiceConnect"
+          type="alertmodal">
+        We're having trouble connecting your voiceserver using [HOSTID].
+        Voice communications will not be available.
+        Please check your network and firewall setup.
+        <form name="form">
+            <button
+               default="true"
+               index="0"
+               name="OK"
+               text="OK"/>
+        </form>
+    </notification>
+
   <notification
    icon="notifytip.tga"
    name="AvatarRezLeftNotification"
@@ -6272,6 +6308,14 @@ Avatar '[NAME]' left as fully loaded.
   </notification>
 
   <notification
+   icon="notifytip.tga"
+   name="AvatarRezSelfBakeNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+You uploaded a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
+  </notification>
+
+  <notification
    icon="alertmodal.tga"
    name="ConfirmLeaveCall"
    type="alert">
diff --git a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
index 066992b25d..44437d01eb 100644
--- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
@@ -8,6 +8,7 @@
  height="45"
  layout="topleft"
  name="Mockup Tab"
+ selection_enabled="true"
  title="Mockup Tab"
  translate="false"
  width="0">
@@ -18,5 +19,6 @@
      multi_select="true"
      name="wearable_items_list"
      translate="false"
+     use_internal_context_menu="false"
     />
 </accordion_tab>
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 e3f6045e27..2edd643cc5 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="22"
+ height="23"
  layout="topleft"
  left="0"
  name="wearable_item"
@@ -9,7 +9,7 @@
  width="380">
     <icon
      follows="top|right|left"
-     height="20"
+     height="23"
      image_name="ListItem_Over"
      layout="topleft"
      left="0"
@@ -18,7 +18,7 @@
      visible="false"
      width="380" />
     <icon
-     height="20"
+     height="23"
      follows="top|right|left"
      image_name="ListItem_Select"
      layout="topleft"
@@ -48,16 +48,28 @@
      top="4"
      value="..."
      width="359" />
-    <icon 
+    <panel
+     background_visible="false"
      name="btn_lock"
      layout="topleft"
      follows="top|right"
      image_name="Locked_Icon"
-     top="2"
+     top="0"
      left="0"
-     height="13"
-     width="9"
-     tab_stop="false" />
+     height="23"
+     width="23"
+     tab_stop="false">
+        <icon 
+         name="btn_lock1"
+         layout="topleft"
+         follows="top|right"
+         image_name="Locked_Icon"
+         top="2"
+         left="5"
+         height="13"
+         width="9"
+         tab_stop="false" />
+    </panel>
     <button 
      name="btn_edit"
      layout="topleft"
@@ -65,8 +77,8 @@
      image_overlay="Edit_Wrench"
      top="0"
      left_pad="3"
-     height="20"
-     width="20"
+     height="23"
+     width="23"
      tab_stop="false" />
     <panel
      background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
index 9d19b89a61..dc123f13f4 100644
--- a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
@@ -25,12 +25,12 @@
      follows="top|right"
      height="25"
      image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="Shop"
      image_selected="Toolbar_Middle_Selected"
      image_unselected="Toolbar_Middle_Off"
-     label="Shop >" 
      layout="topleft"
      right="-5"
      name="bodyparts_shop_btn"
      top="5"
-     width="61" />
+     width="45" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
index 2359719c2a..5b3f0b17a9 100644
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
@@ -26,12 +26,12 @@
      follows="top|right"
      height="25"
      image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="Shop"
      image_selected="Toolbar_Middle_Selected"
      image_unselected="Toolbar_Middle_Off"
-     label="Shop >" 
      layout="topleft"
      right="-5"
      name="clothing_shop_btn"
      top="5"
-     width="61" />
+     width="45" />
 </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 b1782f405e..035e8607ec 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
@@ -9,7 +9,7 @@
  width="380">
     <icon
      follows="top|right|left"
-     height="20"
+     height="23"
      image_name="ListItem_Over"
      layout="topleft"
      left="0"
@@ -18,7 +18,7 @@
      visible="false"
      width="380" />
     <icon
-     height="20"
+     height="23"
      follows="top|right|left"
      image_name="ListItem_Select"
      layout="topleft"
@@ -66,8 +66,8 @@
      image_overlay="UpArrow_Off"
      top="0"
      left="0"
-     height="20"
-     width="20"
+     height="23"
+     width="23"
      tab_stop="false" />
     <button 
      name="btn_move_down"
@@ -76,18 +76,31 @@
      image_overlay="DownArrow_Off"
      top="0"
      left_pad="3"
-     height="20"
-     width="20"
+     height="23"
+     width="23"
      tab_stop="false" />
-    <icon
+    <panel
+     background_visible="false"
      name="btn_lock"
      layout="topleft"
      follows="top|right"
      image_name="Locked_Icon"
-     top="2"
-     left_pad="1"
-     height="13"
-     width="9" />
+     top="0"
+     left="0"
+     height="23"
+     width="23"
+     tab_stop="false">
+        <icon 
+         name="btn_lock1"
+         layout="topleft"
+         follows="top|right"
+         image_name="Locked_Icon"
+         top="2"
+         left="5"
+         height="13"
+         width="9"
+         tab_stop="false" />
+    </panel>
     <button 
      name="btn_edit"
      layout="topleft"
@@ -95,8 +108,8 @@
      image_overlay="Edit_Wrench"
      top="0"
      left_pad="3"
-     height="20"
-     width="20"
+     height="23"
+     width="23"
      tab_stop="false" />
     <panel
      background_visible="true"
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 c5fbd1cae6..06371b7489 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="22"
+ height="23"
  layout="topleft"
  left="0"
  name="dummy_clothing_item"
@@ -9,7 +9,7 @@
  width="380">
     <icon
      follows="top|right|left"
-     height="20"
+     height="23"
      image_name="ListItem_Over"
      layout="topleft"
      left="0"
@@ -18,7 +18,7 @@
      visible="false"
      width="380" />
     <icon
-     height="20"
+     height="23"
      follows="top|right|left"
      image_name="ListItem_Select"
      layout="topleft"
@@ -56,8 +56,8 @@
      image_overlay="AddItem_Off"
      top="0"
      left="0"
-     height="20"
-     width="20"
+     height="23"
+     width="23"
      tab_stop="false" />
     <panel
      background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index 6d02dd41de..23a08344ea 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
@@ -25,49 +25,58 @@
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="100"
+        height="115"
         label="Head Tattoo"
         layout="topleft"
-        left="30"
+        left="20"
         name="Head Tattoo"
         tool_tip="Click to choose a picture"
         top="10"
-        width="94" />
+        width="115" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="100"
+        height="115"
         label="Upper Tattoo"
         layout="topleft"
         left_pad="30"
         name="Upper Tattoo"
         tool_tip="Click to choose a picture"
         top="10"
-        width="94" />
+        width="115" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <texture_picker
         can_apply_immediately="true"
         default_image_name="Default"
         follows="left|top"
-        height="100"
+        height="115"
         label="Lower Tattoo"
         layout="topleft"
-        left="30"
+        left="20"
         name="Lower Tattoo"
         tool_tip="Click to choose a picture"
         top_pad="10"
-        width="94" />
+        width="115" >
+         <texture_picker.commit_callback
+             function="TexturePicker.Commit" />
+       </texture_picker>
        <color_swatch
         can_apply_immediately="true"
         follows="left|top"
-        height="80"
+        height="115"
         label="Color/Tint"
         layout="topleft"
-        left_pad="20"
+        left_pad="30"
         name="Color/Tint"
         tool_tip="Click to open color picker"
-        top="10"
-        width="64" >
+        top_delta="0"
+        width="115" >
          <color_swatch.commit_callback
              function="ColorSwatch.Commit" />
        </color_swatch>
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 71f740590b..0455086ef3 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -107,7 +107,7 @@ left="0"
 		Jacket:
 	</string>
 	<string
-		name="skirt_skirt_desc_text">
+		name="skirt_desc_text">
 		Skirt:
 	</string>
 	<string
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 895cc4e3cc..abd96c89e7 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -150,11 +150,17 @@
 
 
 <!-- LIST OF WEARABLES (CURRENT OUTFIT/ WEARABLES TO ADD) -->
+<!-- *NOTE: border_size is used to calculate space between layout panel and for resize bar height
+required height for dragbar is 10, so resizebar height should be 10 px.
+It is calculated as border_size + 2*UIResizeBarOverlap
+-->
     <layout_stack
      animate="false"
+     border_size="8"
+     clip="false"
      default_tab_group="2"
      follows="all"
-     height="495"
+     height="468"
      width="313"
      layout="topleft"
      orientation="vertical"
@@ -164,7 +170,7 @@
      left="5">
         <layout_panel
          layout="topleft"
-         height="220"
+         height="193"
          label="IM Control Panel"
          min_height="100"
          name="outfit_wearables_panel"
@@ -184,53 +190,28 @@
              name="cof_wearables_list"
              top="0"
              width="311" />
-
-          <!-- Button bar -->
-          <panel
-             background_visible="true"
-             bevel_style="none"
-             follows="bottom|left|right"
-             height="27"
-             label="bottom_panel"
-             layout="topleft"
-             left="0"
-             name="edit_panel"
-             top="193"
-             width="313">
-                <button
-                 follows="bottom|left"
-                 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="gear_menu_btn"
-                 top="1"
-                 width="31" />
-                <icon
-                 follows="bottom|left|right"
-                 height="25"
-                 image_name="Toolbar_Right_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="dummy_right_icon"
-                 width="281" />
-            </panel>
         </layout_panel>
 
 
         <layout_panel
+         background_visible="true"
+         bg_alpha_color="DkGray2"
          auto_resize="true"
          default_tab_group="3"
-         height="210" 
+         height="184"
          min_height="210"
          name="add_wearables_panel"
          width="313"
          tab_group="2"
          user_resize="true"
          visible="false">
+          <icon
+           follows="left|top|right"
+           height="10"
+           image_name="Dragbar"
+           left="0"
+           top_pad="-9"
+           width="313" />
          	<text
              follows="top|left|right"
              font="SansSerifBold"
@@ -239,22 +220,19 @@
              left="5"
              name="add_to_outfit_label"
              text_color="LtGray"
-             top="3"
+             top="4"
              value="Add to Outfit:"
              use_ellipses="true"
              width="150" />
             <button
-             follows="top|left|right"
+             follows="top|right"
              height="20"
-             image_hover_unselected="Toolbar_Middle_Over"
              image_overlay="Search_Icon"
-             image_selected="Toolbar_Middle_Selected"
-             image_unselected="Toolbar_Middle_Off"
              is_toggle="true"
              layout="topleft"
              left_pad="5"
              name="filter_button"
-             top="3"
+             top_delta="0"
              width="20" />
             <combo_box
              follows="top|left|right"
@@ -262,14 +240,14 @@
              layout="topleft"
              right="-5"
              name="filter_wearables_combobox"
-             top="2"
+             top_delta="0"
              width="110"/>
 
             <layout_stack
              animate="true"
              follows="all"
              height="155"
-             width="311"
+             width="313"
              layout="topleft"
              name="filter_panels"
              top_pad="5"
@@ -301,6 +279,8 @@
                 </layout_panel>
                 <layout_panel
                  auto_resize="true"
+                 background_visible="true"
+                 bg_alpha_color="0.107 0.107 0.107 1"
                  height="145"
                  min_width="130"
                  name="inventory_panel"
@@ -308,6 +288,7 @@
                  user_resize="true">
                     <inventory_panel
 		             allow_multi_select="true"
+		             background_visible="false"
 		             border="false"
 		             follows="left|top|right|bottom"
 		             height="140"
@@ -321,7 +302,7 @@
 		            <panel
 		             name="filtered_wearables_panel"
 		             background_opaque="true"
-		             background_visible="true"
+		             background_visible="false"
 		             layout="topleft"
 		             follows="left|top|right|bottom"
 		             border="false"
@@ -332,6 +313,7 @@
 		             top_delta="0"
 		             visible="true">
 		             <wearable_items_list
+		              color="0.107 0.107 0.107 1"
 		              name="filtered_wearables_list"
 		              allow_select="true"
 		              layout="topleft"
@@ -344,82 +326,98 @@
 		            </panel>
                 </layout_panel>
             </layout_stack>
-
-            <panel
-             background_visible="true"
-             bevel_style="none"
-             follows="left|right|bottom"
-             height="27"
-             label="add_wearables_button_bar"
-             layout="topleft"
-             left="0"
-             name="add_wearables_button_bar"
-             top_pad="0"
-             width="313">
-                <button
-                 follows="bottom|left"
-                 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="wearables_gear_menu_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Hierarchy_View_Disabled"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 is_toggle="true"
-                 layout="topleft"
-                 left_pad="1"
-                 name="folder_view_btn"
-                 top="1"
-                 width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="List_View_On"
-                 image_selected="Toolbar_Middle_Selected"
-                 image_unselected="Toolbar_Middle_Off"
-                 is_toggle="true"
-                 layout="topleft"
-                 left_pad="1"
-                 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_Right_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="dummy_right_icon"
-                 width="184" >
-                 </icon>
-            </panel>
-        </layout_panel>
+       </layout_panel>
     </layout_stack>
 
+    <!-- Button bar -->
+    <panel
+     background_visible="true"
+     bevel_style="none"
+     follows="left|right|bottom"
+     height="27"
+     label="add_wearables_button_bar"
+     layout="topleft"
+     left="4"
+     name="add_wearables_button_bar"
+     top_pad="0"
+     width="313">
+        <button
+         follows="bottom|left"
+         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="wearables_gear_menu_btn"
+         top="1"
+         width="31" />
+        <button
+         follows="bottom|left"
+         height="25"
+         image_hover_unselected="Toolbar_Middle_Over"
+         image_overlay="Hierarchy_View_Disabled"
+         image_selected="Toolbar_Middle_Selected"
+         image_unselected="Toolbar_Middle_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="1"
+         name="folder_view_btn"
+         top="1"
+         visible="false"
+         width="31" />
+        <button
+         follows="bottom|left"
+         height="25"
+         image_hover_unselected="Toolbar_Middle_Over"
+         image_overlay="List_View_On"
+         image_selected="Toolbar_Middle_Selected"
+         image_unselected="Toolbar_Middle_Off"
+         is_toggle="true"
+         layout="topleft"
+         left_pad="1"
+         name="list_view_btn"
+         top="1"
+         visible="false"
+         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"
+         visible="false"
+         width="31" />
+       <icon
+        follows="bottom|left|right"
+        height="25"
+        image_name="Toolbar_Right_Off"
+        layout="topleft"
+        left_pad="1"
+        name="add_wearables_dummy_icon"
+        top="1"
+        visible="false"
+        width="184" >
+       </icon>
+       <icon
+        follows="bottom|left|right"
+        height="25"
+        image_name="Toolbar_Right_Off"
+        layout="topleft"
+        left="32"
+        name="dummy_right_icon"
+        top="1"
+        width="281" >
+       </icon>
+    </panel>
+
     <panel
      follows="left|right|bottom"
      height="30"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
index 9e59651bd1..13e1f5ba5c 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -93,17 +93,30 @@
          left_pad="1"
          name="trash_btn"
          tool_tip="Remove selected item"
-         width="31"/>
-	 <button
-	  follows="bottom|left"
-		height="23" 
-      label="Save Outfit" 
-      layout="topleft"
-      name="make_outfit_btn"
-      tool_tip="Save appearance as an outfit"
+         width="31"/>         
+     <button
+       follows="bottom|left"
+       height="23"
+       label="Save As"
+       left="0"         
+       layout="topleft"
+       name="save_btn"
        top_pad="6"
-       left="0"
-      width="153" />
+       width="155" />
+     <button
+       follows="bottom|left"
+       height="23"
+       name="save_flyout_btn"
+       label=""
+       layout="topleft"
+       left_pad="-20"
+       tab_stop="false"
+       image_selected="SegmentedBtn_Right_Selected_Press"
+       image_unselected="SegmentedBtn_Right_Off"
+       image_pressed="SegmentedBtn_Right_Press"
+       image_pressed_selected="SegmentedBtn_Right_Selected_Press"
+       image_overlay="Arrow_Small_Up"
+       width="20"/>
      <button
       follows="bottom|left|right" 
       height="23" 
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index 3effc9de89..07642946f8 100644
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -6,12 +6,13 @@
  name="panel_stand_stop_flying"
  mouse_opaque="false"
  visible="true"
- width="113">
+ width="133">
     <button
      follows="left|bottom"
      height="19"
      label="Stand"
      layout="topleft"
+     left="10"
      name="stand_btn"
      tool_tip="Click here to stand up."
      top="2"
@@ -22,6 +23,7 @@
      height="19"
      label="Stop Flying"
      layout="topleft"
+     left="10"
      name="stop_fly_btn"
      tool_tip="Stop flying"
      top="2"
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 e0c9c49a23..008aa1acc0 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -44,6 +44,7 @@
     <button
      auto_resize="true"
      halign="center"
+	 enabled="false"
      font="SansSerifSmall"
      follows="right|top"
      image_overlay=""
@@ -54,6 +55,8 @@
      right="-275"
      label_shadow="false"
      name="buycurrency"
+     label_color_disabled="ButtonLabelColor"
+     image_color_disabled="White"
      tool_tip="My Balance"
      pad_left="12"
      pad_right="12" 
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 5a6b3ec096..3d7b0b7edc 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -86,7 +86,7 @@ width="333">
       </text>
       <button
       follows="left|top"
-      height="20"
+      height="23"
       image_overlay="Edit_Wrench"
       label=""
       layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8e1cf35ce8..614b681853 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -48,12 +48,10 @@
 	<string name="LoginDownloadingClothing">Downloading clothing...</string>
         <string name="InvalidCertificate">The server returned an invalid or corrupt certificate. Please contact the Grid administrator.</string>
         <string name="CertInvalidHostname">An invalid hostname was used to access the server, please check your SLURL or Grid hostname.</string>
-        <string name="CertExpired">The certificate returned by the Grid appears to be expired.  Please check your system clock, or contact your Grid administr\
-ator.</string>
+        <string name="CertExpired">The certificate returned by the Grid appears to be expired.  Please check your system clock, or contact your Grid administrator.</string>
         <string name="CertKeyUsage">The certificate returned by the server could not be used for SSL.  Please contact your Grid administrator.</string>
         <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain.  Please contact your Grid administrator.</string>
-        <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified.  Please contact your Grid administrat
-or.</string>
+        <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified.  Please contact your Grid administrator.</string>
 
 	<string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string>
 	<string name="LoginFailed">Login failed.</string>
@@ -3183,7 +3181,23 @@ Abuse Report</string>
   <string name="server_is_down">
 	Despite our best efforts, something unexpected has gone wrong.
 
-	Please check secondlife.com/status to see if there is a known problem with the service.
+	Please check secondlife.com/status to see if there is a known problem with the service.  
+        If you continue to experience problems, please check your network and firewall setup.
   </string>
 
+  <!-- overriding datetime formating. 
+	leave emtpy in for current localization this is not needed 
+	list of values should be separated with ':'
+        example:
+	<string name="dateTimeWeekdaysShortNames">
+	Son:Mon:Tue:Wed:Thu:Fri:Sat
+	</string>  	
+  -->
+  <string name="dateTimeWeekdaysNames"></string>
+  <string name="dateTimeWeekdaysShortNames"></string>
+  <string name="dateTimeMonthNames"></string>
+  <string name="dateTimeMonthShortNames"></string>
+  <string name="dateTimeDayFormat"></string>
+  <string name="dateTimeAM"></string>
+  <string name="dateTimePM"></string>
   </strings>
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index c4f0fe5208..6dcc27b469 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -7,6 +7,7 @@
         image_selected="PushButton_Selected"
         image_disabled_selected="PushButton_Selected_Disabled"
         image_disabled="PushButton_Disabled"
+        image_flash="FlashIconAbsent"
         image_top_pad="0"
         image_bottom_pad="0"
         imgoverlay_label_space="1"
diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
new file mode 100644
index 0000000000..98707b8495
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel_camera_item
+ background_visible="false"
+ height="30"
+ layout="topleft"
+ width="212">
+  <panel_camera_item.icon_over
+   follows="top|left"
+     height="30"
+     image_name="ListItem_Over"
+     left="0"
+     mouse_opaque="false"
+     layout="topleft"
+     name="hovered_icon"
+     top="30"
+     scale_image="true"
+     visible="false"
+     width="212" />
+  <panel_camera_item.icon_selected
+   follows="top|left"
+     height="30"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     mouse_opaque="false"
+     name="selected_icon"
+     top="30"
+     scale_image="true"
+     visible="false"
+     width="212" />
+  <panel_camera_item.picture
+     follows="top|left"
+     height="30"
+     image_name="Icon_For_Sale"
+     layout="topleft"
+     left="0"
+     mouse_opaque="false"
+     name="picture"
+     tab_stop="false"
+     top="30"
+     top_pad="10"
+     width="30" />
+  <panel_camera_item.selected_picture
+     follows="top|left"
+     height="30"
+     image_name="Cam_Rotate_In"
+     layout="topleft"
+     left="0"
+     mouse_opaque="false"
+     name="selected_picture"
+     tab_stop="false"
+     top="30"
+     top_pad="8"
+     visible="false" 
+     width="30" />
+  <panel_camera_item.text
+   follows="top|left|right"
+     font="SansSerifMedium"
+     height="15"
+     layout="topleft"
+     left ="38"
+     name="picture_name"
+     text_color="white"
+     top="21"
+     use_ellipses="true"
+     width="170"
+     word_wrap="false" >
+   Text
+   </panel_camera_item.text>
+</panel_camera_item>
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 8d6b0c1cfe..30b0a8462a 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -13,20 +13,29 @@ label_pad_left - padding to the left of tab button labels
                label_pad_left="4">
   <first_tab tab_top_image_unselected="TabTop_Left_Off"
                tab_top_image_selected="TabTop_Left_Selected"
+               tab_top_image_flash="FlashIconAbsent"
                tab_bottom_image_unselected="Toolbar_Left_Off"
                tab_bottom_image_selected="Toolbar_Left_Selected"
+               tab_bottom_image_flash="FlashIconAbsent"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
+               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
+               tab_left_image_flash="FlashIconAbsent"/>
   <middle_tab tab_top_image_unselected="TabTop_Middle_Off"
                tab_top_image_selected="TabTop_Middle_Selected"
+               tab_top_image_flash="FlashIconAbsent"
                tab_bottom_image_unselected="Toolbar_Middle_Off"
                tab_bottom_image_selected="Toolbar_Middle_Selected"
+               tab_bottom_image_flash="FlashIconAbsent"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
+               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
+               tab_left_image_flash="FlashIconAbsent"/>
   <last_tab tab_top_image_unselected="TabTop_Right_Off"
                tab_top_image_selected="TabTop_Right_Selected"
+               tab_top_image_flash="FlashIconAbsent"
                tab_bottom_image_unselected="Toolbar_Right_Off"
                tab_bottom_image_selected="Toolbar_Right_Selected"
+               tab_bottom_image_flash="FlashIconAbsent"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
+               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
+               tab_left_image_flash="FlashIconAbsent"/>
 </tab_container>