merge

29 files changed, 331 insertions, 309 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 4643f66bd8..4b990fa566 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
  can_resize="false"
- height="280"
+ can_close="true"
+ width="422"
+ height="202"
  layout="topleft"
- min_height="280"
- min_width="450"
  name="floater_buy_currency_html"
  help_topic="floater_buy_currency_html"
  save_rect="true"
  single_instance="true"
  title="BUY CURRENCY"
- width="452">
- <floater.string
-      name="buy_currency_url" translate="false">
-        https://quick-buy-www.jeff.ooze.lindenlab.com/en/display
- </floater.string>
-    <web_browser
-     bottom="278"
-     follows="left|right|top|bottom"
-     layout="topleft"
-     left="2"
-     name="browser"
-     top="18"
-     width="450" />
+>
+  <floater.string
+    name="buy_currency_url" translate="false">
+    https://quick-buy.secondlife.com/[LANGUAGE]/display/?sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
+  </floater.string>
+  <web_browser
+    follows="all"
+    layout="topleft"
+    left="1"
+    right="-1" 
+    top="1"
+    bottom="-1" 
+    ignore_ui_scale="false"
+    name="browser"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index f537c81860..c9b013099b 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -33,7 +33,6 @@
       name="panel_im_control_panel"
       layout="topleft"
       follows="left"
-      label="IM Control Panel"
       min_width="115" 
       auto_resize="false"
       user_resize="true" />
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index f3d297c303..7d81c3e551 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -38,91 +38,129 @@
     left="20"
     top_pad="-30"
     name="new_snapshot_btn"
-    width="23" />
+    width="23"
+    commit_callback.function="Snapshot.Refresh"/>
   <line_editor
     border_style="line"
     border_thickness="1"
-	  follows="left|top"
-	  height="20"
-		layout="topleft"
+    follows="left|top"
+    height="20"
+    layout="topleft"
     left="10"
-		max_length="500"
+    max_length="500"
     name="description"
-	  top_pad="15"
-	  width="230"
+    top_pad="15"
+    width="230"
     label="Description"/>
+  <panel
+   top_pad="20"
+   left="10"
+   height="83"
+   name="panel_snapshot_main"
+   width="130">
+    <button
+     label="Share Snapshot"
+     name="share"
+     top="0"
+     left="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="share"/>
+    <button
+     label="Save Snapshot"
+     name="save"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="save"/>
+    <button
+     label="Set As Profile Pic"
+     name="set_profile_pic"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+  </panel>
+  <panel
+   top_delta="0"
+   left_delta="0"
+   height="83"
+   name="panel_snapshot_share"
+   width="130">
+    <button
+     label="Share to Web"
+     name="share_to_web"
+     top="0"
+     left="0"
+     visible="false"
+     width="130"/>
+    <button
+     label="Email Snapshot"
+     name="share_to_email"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+    <button
+     label="Back"
+     name="cancel_share"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="main"/>
+  </panel>
+  <panel
+   top_delta="0"
+   left_delta="0"
+   height="83"
+   name="panel_snapshot_save"
+   width="130">
+    <button
+     label="Save to My Inventory"
+     name="save_to_inventory"
+     top="0"
+     left="0"
+     width="130"/>
+    <button
+     label="Save to My Computer"
+     name="save_to_computer"
+     top_pad="7"
+     left_delta="0"
+     width="130"/>
+    <button
+     label="Back"
+     name="cancel_save"
+     top_pad="7"
+     left_delta="0"
+     width="130"
+     commit_callback.function="Snapshot.ShowButtons"
+     commit_callback.parameter="main"/>
+  </panel>
   <button
-   label="Share Snapshot" 
-   name="share" 
-   top_pad="20" 
-   left="10" 
-   width="130"/>
+   follows="left"
+   height="22"
+   layout="topleft"
+   left="210"
+   name="show_advanced"
+   image_overlay="TabIcon_Close_Off"
+   bottom_delta="0"
+   width="30"
+   commit_callback.function="Snapshot.ShowAdvanced"/>
   <button
-   label="Share to Web" 
-   name="share_to_web" 
-   top_delta="0" 
-   left="10" 
+   follows="left"
+   height="22"
+   layout="topleft"
+   left="210"
+   name="hide_advanced"
+   image_overlay="TabIcon_Open_Off"
+   top_delta="0"
    visible="false"
-   width="130"/>
-  <button
-   label="Save to My Inventory" 
-   name="save_to_inventory" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Save Snapshot" 
-   name="save" 
-   top_pad="7" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Email Snapshot" 
-   name="share_to_email" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Save to My Computer" 
-   name="save_to_computer" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Set As Profile Pic" 
-   name="set_profile_pic" 
-   top_pad="7" 
-   left="10" 
-   width="130"/>
-  <button
-   label="Back" 
-   name="cancel" 
-   top_delta="0" 
-   left="10" 
-   width="130"/>
-  <button
-     follows="left"
-     height="22"
-     layout="topleft"
-     left="210"
-    name="show_advanced"
-    image_overlay="TabIcon_Close_Off"
-    top_delta="1"
-    width="30"/>
-  <button
-     follows="left"
-     height="22"
-     layout="topleft"
-     left="210"
-     visible="false" 
-     name="hide_advanced"
-     image_overlay="TabIcon_Open_Off"
-     top_delta="0"
-     width="30"/>
+   width="30"
+   commit_callback.function="Snapshot.HideAdvanced"/>
   <panel 
-    visible="false" 
-    left="250" 
-    top="17"    
-    name="snapshot_advanced" 
-    filename="panel_snapshot_advanced.xml"/>
+   visible="false"
+   left="250"
+   top="17"
+   name="snapshot_advanced"
+   filename="panel_snapshot_advanced.xml"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 4e6a07d020..62365f7cc2 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -61,14 +61,6 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Empty Trash"
-     layout="topleft"
-     name="empty_trash">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_trash" />
-    </menu_item_call>
-    <menu_item_call
      label="Empty Lost and Found"
      layout="topleft"
      name="empty_lostnfound">
@@ -111,4 +103,15 @@
 			 function="Inventory.GearDefault.Enable"
 			 parameter="find_links" />
         </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+
+    <menu_item_call
+     label="Empty Trash"
+     layout="topleft"
+     name="empty_trash">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_trash" />
+    </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
index b5eda8e999..c4e31ed180 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -170,7 +170,7 @@
 
     <menu_item_separator />
     <menu_item_call
-     label="Rename"
+     label="Rename Outfit"
      layout="topleft"
      name="rename">
         <on_click
diff --git a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
index fa5ca60a19..430a7b6444 100644
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
@@ -38,13 +38,6 @@
      layout="topleft"
      name="wearable_attach_to_hud" />
     <menu_item_call
-     label="Object Profile"
-     layout="topleft"
-     name="object_profile">
-        <on_click
-         function="Attachment.Profile" />
-    </menu_item_call>
-    <menu_item_call
      label="Take Off"
      layout="topleft"
      name="take_off">
@@ -59,6 +52,13 @@
          function="Wearable.Edit" />
     </menu_item_call>
     <menu_item_call
+     label="Object Profile"
+     layout="topleft"
+     name="object_profile">
+        <on_click
+         function="Attachment.Profile" />
+    </menu_item_call>
+    <menu_item_call
      label="Show Original"
      layout="topleft"
      name="show_original">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 6d3d0f13bf..aca3b750c8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2066,6 +2066,7 @@ Would you be my friend?
        name="Cancel"
        text="Cancel"/>
     </form>
+    <unique/>
   </notification>
 
   <notification
@@ -6207,7 +6208,7 @@ The button will be shown when there is enough space for it.
    icon="notifytip.tga"
    name="ShareNotification"
    type="notifytip">
-Drag items from inventory onto a person in the resident picker
+Select residents to share with.
   </notification>
   <notification
    icon="notifytip.tga"
@@ -6304,36 +6305,39 @@ Avatar '[NAME]' entered appearance mode.
 Avatar '[NAME]' left appearance mode.
   </notification>
 
-    <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>
+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="alertmodal.tga"
+   name="NoVoiceConnect"
+   type="alertmodal">
+We're having trouble connecting to your voice server:
+
+[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"
@@ -6361,7 +6365,7 @@ Are you sure you want to leave this call?
      name="okcancelignore"
      notext="No"
      yestext="Yes"/>
-     <unique/>
+    <unique/>
   </notification>
 
   <notification
@@ -6378,7 +6382,7 @@ Mute everyone?
      name="okcancelignore"
      yestext="Ok"
      notext="Cancel"/>
-     <unique/>
+    <unique/>
   </notification>
 
   <global name="UnsupportedCPU">
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 a0bbc8f2ee..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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="25"
+ height="23"
  layout="topleft"
  left="0"
  name="wearable_item"
@@ -45,7 +45,7 @@
      use_ellipses="true"
      name="item_name"
      text_color="white"
-     top="4"
+     top="5"
      value="..."
      width="359" />
     <panel
@@ -74,10 +74,10 @@
      name="btn_edit_panel"
      layout="topleft"
      follows="top|right"
-     top="0"
+     top="1"
      left_pad="3"
-     height="24"
-     width="27"
+     height="23"
+     width="26"
      tab_stop="false">
          <button 
           name="btn_edit"
@@ -86,8 +86,8 @@
           image_overlay="Edit_Wrench"
           top="0"
           left="0"
-          height="24"
-          width="24"
+          height="23"
+          width="23"
           tab_stop="false" />
       </panel>
     <icon
@@ -97,7 +97,7 @@
      layout="bottomleft"
      left="0"
      name="wearable_type_separator_icon"
-     top="3"
+     top="0"
      visible="true"
      width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 82b2405ec9..4eff5bc48a 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -90,7 +90,7 @@
                  label="Speak"
                  label_selected="Speak"
                  name="speak_btn"
-                 pad_right="22"
+                 pad_right="20"
                  tab_stop="true"
                  use_ellipses="true" />
             </talk_button>
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 e41141f6bd..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
@@ -33,7 +33,7 @@
      follows="top|left"
      image_unselected="Toast_CloseBtn"
      image_selected="Toast_CloseBtn"
-     top="2"
+     top="3"
      left="0"
      height="18"
      width="18"
@@ -56,7 +56,7 @@
      use_ellipses="true"
      name="item_name"
      text_color="white"
-     top="4"
+     top="5"
      value="..."
      width="359" />
     <button 
@@ -64,20 +64,20 @@
      layout="topleft"
      follows="top|right"
      image_overlay="UpArrow_Off"
-     top="0"
+     top="1"
      left="0"
-     height="24"
-     width="24"
+     height="23"
+     width="23"
      tab_stop="false" />
     <button 
      name="btn_move_down"
      layout="topleft"
      follows="top|right"
      image_overlay="DownArrow_Off"
-     top="0"
+     top="1"
      left_pad="3"
-     height="24"
-     width="24"
+     height="23"
+     width="23"
      tab_stop="false" />
     <panel
      background_visible="false"
@@ -107,18 +107,18 @@
      follows="top|right"
      top="0"
      left_pad="3"
-     height="24"
-     width="27"
+     height="23"
+     width="26"
      tab_stop="false">
         <button 
          name="btn_edit"
          layout="topleft"
          follows="top|right"
          image_overlay="Edit_Wrench"
-         top="0"
+         top="1"
          left="0"
-         height="24"
-         width="24"
+         height="23"
+         width="23"
          tab_stop="false" />
       </panel>
     <icon
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 5f34c24bca..f016c27b0a 100644
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
@@ -11,7 +11,7 @@
     <accordion
      fit_parent="true"
      follows="all"
-     height="200"
+     height="198"
      layout="topleft"
      left="0"
      single_expansion="true"
@@ -28,6 +28,7 @@
              allow_select="true"
              follows="all"
              height="10"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -43,6 +44,7 @@
              allow_select="true"
              follows="all"
              height="10"
+             item_pad="3"
              layout="topleft"
              left="0"
              multi_select="true"
@@ -58,6 +60,7 @@
              allow_select="true"
              follows="all"
              height="10"
+             item_pad="3"
              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 b006d125ee..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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  follows="top|right|left"
- height="25"
+ height="23"
  layout="topleft"
  left="0"
  name="deletable_wearable_item"
@@ -33,7 +33,7 @@
      follows="top|left"
      image_unselected="Toast_CloseBtn"
      image_selected="Toast_CloseBtn"
-     top="2"
+     top="3"
      left="0"
      height="18"
      width="18"
@@ -56,7 +56,7 @@
      use_ellipses="true"
      name="item_name"
      text_color="white"
-     top="4"
+     top="5"
      value="..."
      width="359" />
     <icon
@@ -66,7 +66,7 @@
      layout="bottomleft"
      left="0"
      name="wearable_type_separator_icon"
-     top="3"
+     top="0"
      visible="true"
      width="380"/>
 </panel>
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 6c43635d49..b1f4cbb079 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="25"
+ height="23"
  layout="topleft"
  left="0"
  name="dummy_clothing_item"
@@ -49,16 +49,26 @@
      top="4"
      value="..."
      width="359" />
-    <button 
-     name="btn_add"
+    <panel
+     name="btn_add_panel"
      layout="topleft"
      follows="top|right"
-     image_overlay="AddItem_Off"
      top="0"
      left="0"
-     height="24"
-     width="24"
-     tab_stop="false" />
+     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" />
+    </panel>
     <icon
      follows="left|right|top"
      height="3"
@@ -66,7 +76,7 @@
      layout="bottomleft"
      left="0"
      name="wearable_type_separator_icon"
-     top="3"
+     top="0"
      visible="true"
      width="380"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index cf15fb0455..d295f5fe4a 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -8,19 +8,22 @@
 	 name="edit_shape_panel"
 	 top_pad="10"
 	 width="333" >
-	 <text
-		 follows="top|left|right"
-		 font="SansSerifSmallBold"
-		 halign="right"
-		 height="12"
-		 layout="topleft"
-		 left="0"
-		 name="avatar_height"
-		 text_color="EmphasisColor"
-		 top="0"
-		 width="310">
-		 [HEIGHT] Meters tall
-	 </text>
+     <string name="meters">Meters</string>
+     <string name="feet">Feet</string>
+     <string name="height">Height:</string>
+     <string name="heigth_label_color" translate="false">White_50</string>
+     <string name="heigth_value_label_color" translate="false">White</string>
+     <text
+         follows="top|left|right"
+         font="SansSerifSmallBold"
+         halign="right"
+         height="12"
+         layout="topleft"
+         left="0"
+         name="avatar_height"
+         top="0"
+         width="310">
+     </text>
      <panel
          border="false"
          bg_alpha_color="DkGray2"
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 67ff71cef1..645ee8a435 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
@@ -7,6 +7,7 @@
  label="Wearable"
  layout="topleft"
 left="0"
+ help_topic="edit_wearable"
  name="panel_edit_wearable"
 	top="0"
  width="333">
@@ -235,7 +236,7 @@ left="0"
 	 </panel>
 	 <panel
 		 follows="all"
-		 height="408"
+		 height="433"
 		 layout="topleft"
 		 left="0"
 		 name="edit_subpanel_container"
@@ -246,7 +247,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shape.xml"
 			 follows="all"
-			 height="408"
+			 height="433"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shape_panel"
@@ -256,7 +257,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_skin.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_skin_panel"
@@ -266,7 +267,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_hair.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_hair_panel"
@@ -276,7 +277,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_eyes.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_eyes_panel"
@@ -286,7 +287,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shirt.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shirt_panel"
@@ -296,7 +297,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_pants.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_pants_panel"
@@ -306,7 +307,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_shoes.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_shoes_panel"
@@ -316,7 +317,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_socks.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_socks_panel"
@@ -326,7 +327,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_jacket.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_jacket_panel"
@@ -336,7 +337,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_skirt.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_skirt_panel"
@@ -346,7 +347,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_gloves.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_gloves_panel"
@@ -356,7 +357,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_undershirt.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_undershirt_panel"
@@ -366,7 +367,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_underpants.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_underpants_panel"
@@ -376,7 +377,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_alpha.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_alpha_panel"
@@ -386,7 +387,7 @@ left="0"
 		 <panel
 			 filename="panel_edit_tattoo.xml"
 			 follows="all"
-			 height="400"
+			 height="425"
 			 layout="topleft"
 			 left="0"
 			 name="edit_tattoo_panel"
@@ -394,65 +395,7 @@ left="0"
 			 visible="false"
 			 width="333" />
 	 </panel>
-     <panel
-        follows="bottom|left|right"
-        height="25"
-        label="gear_buttom_panel"
-        layout="topleft"
-        left="0"
-        name="gear_buttom_panel"
-        top_pad="0"
-        width="333">
-        <button
-            follows="bottom|left"
-            tool_tip="Options"
-            height="25"
-            image_hover_unselected="Toolbar_Left_Over"
-            image_disabled="OptionsMenu_Disabled"
-            image_overlay="OptionsMenu_Off"
-            image_selected="Toolbar_Left_Selected"
-            image_unselected="Toolbar_Left_Off"
-            layout="topleft"
-            left="10"
-            name="friends_viewsort_btn"
-            top="0"
-            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"
-            image_disabled="AddItem_Disabled"
-            layout="topleft"
-            left_pad="1"
-            name="add_btn"
-            tool_tip="TODO"
-            width="31" />
-        <icon
-            follows="bottom|left|right"
-            height="25"
-            image_name="Toolbar_Middle_Off"
-            layout="topleft"
-            left_pad="1"
-            name="dummy_right_icon"
-            width="218" >
-        </icon>
-        <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"
-            image_disabled="TrashItem_Disabled"
-            layout="topleft"
-            left_pad="1"
-            name="del_btn"
-            tool_tip="TODO"
-            width="31" />
-     </panel>
+
 	 <panel
 		 follows="bottom|left|right"
 		 height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 19fe2ea874..6523b0d491 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -74,16 +74,14 @@ Maximum 200 per group daily
     </text>
       <button
        follows="top|left"
-       height="18"
-       image_selected="AddItem_Press"
-       image_unselected="AddItem_Off"
-       image_disabled="AddItem_Disabled"
+       height="23"
+       image_overlay="AddItem_Off"
        layout="topleft"
        left="5"
        name="create_new_notice"
        tool_tip="Create a new notice"
-     top_delta="-3"
-       width="18" />
+       top_delta="-3"
+       width="23" />
      <button
      follows="top|left"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index d65b86f007..2a53b3e2fa 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -42,7 +42,7 @@
   <filter_editor
    text_pad_left="10"
    follows="left|top|right"
- height="23"
+   height="23"
    label="Filter Inventory"
    layout="topleft"
    left="10"
@@ -68,10 +68,10 @@
      top_pad="10"
      width="312">
     <inventory_panel
-        bg_opaque_color="DkGray2"
-   bg_alpha_color="DkGray2"
-   background_visible="true"
-   background_opaque="true"
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
      border="false"
      bevel_style="none"
      follows="all"
@@ -82,13 +82,14 @@
      left="0"
      name="All Items"
      sort_order_setting="InventorySortOrder"
+	 show_item_link_overlays="true"
      top="16"
      width="288" />
     <recent_inventory_panel
-        bg_opaque_color="DkGray2"
-   bg_alpha_color="DkGray2"
-   background_visible="true"
-   background_opaque="true"
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
      border="false"
      bevel_style="none"
      follows="all"
@@ -98,6 +99,7 @@
      layout="topleft"
      left_delta="0"
      name="Recent Items"
+	 show_item_link_overlays="true"
      width="290" />
   </tab_container>
   <layout_stack
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 769f9b7bbf..741f60669a 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -5,8 +5,8 @@
  border="false"
  height="600"
  follows="all"
- label="Outfit Edit"
  layout="topleft"
+ help_topic="edit_outfit"
  left="0"
  min_height="350"
  name="outfit_edit"
@@ -51,6 +51,7 @@
     <string name="Filter.All" value="All"/>
     <string name="Filter.Clothes/Body" value="Clothes/Body"/>
     <string name="Filter.Objects" value="Objects"/>
+    <string name="Filter.Custom" value="Custom filter"/>
 
 
     <button
@@ -85,7 +86,6 @@
      bevel_style="none"
      follows="top|left|right"
      height="40"
-     label="bottom_panel"
      layout="topleft"
      left="6"
      name="header_panel"
@@ -106,7 +106,6 @@
              bevel_style="none"
              follows="top|right"
              height="38"
-             label="bottom_panel"
              layout="topleft"
              left_pad="5"
              name="outfit_name_and_status"
@@ -160,7 +159,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
         <layout_panel
          layout="topleft"
          height="187"
-         label="IM Control Panel"
          min_height="100"
          name="outfit_wearables_panel"
          width="313"
@@ -183,7 +181,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
                  bg_alpha_color="DkGray2"
                  layout="topleft"
                  height="154"
-                 label="add_button_and_combobox"
                  name="add_button_and_combobox"
                  width="311"
                  user_resize="false"
@@ -256,15 +253,14 @@ It is calculated as border_size + 2*UIResizeBarOverlap
 		             background_image="TextField_Search_Off"
 		             enabled="true"
 		             follows="left|right|top"
-		             font="SansSerif"
-		             label="Filter"
+		             label="Filter Inventory Wearables"
 		             layout="topleft"
 		             left="5"
 		             width="290"
 		             height="25"
 		             name="look_item_filter"
+		             search_button_visible="true"
 		             text_color="black"
-		             text_pad_left="25"
 		             visible="true"/>
                     
                 </layout_panel>
@@ -344,7 +340,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
      bevel_style="none"
      follows="bottom|left|right"
      height="27"
-     label="bottom_panel"
      layout="topleft"
      left="5"
      name="no_add_wearables_button_bar"
@@ -379,7 +374,6 @@ It is calculated as border_size + 2*UIResizeBarOverlap
      bevel_style="none"
      follows="left|right|bottom"
      height="27"
-     label="add_wearables_button_bar"
      layout="topleft"
      left="5"
      name="add_wearables_button_bar"
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 13e1f5ba5c..de1f2cf31b 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
@@ -30,6 +30,7 @@
            height="490"
            name="outfitslist_tab"
            background_visible="true"
+           help_topic="my_outfits_tab"
            follows="all"
            label="MY OUTFITS"
            layout="topleft"
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 5cf94c25d7..5c9ae51a48 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -14,6 +14,7 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
+     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"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index b79ef1e287..da28773c74 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -173,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"
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 c9e41edd5a..59f1f6d638 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -2,7 +2,7 @@
 <panel
  background_visible="true"
  follows="all"
- height="570"
+ height="610"
  layout="topleft"
  left="0"
  min_height="350"
@@ -181,7 +181,7 @@
     <scroll_container
      color="DkGray2"
      follows="all"
-     height="532"
+     height="572"
      layout="topleft"
      left="9"
      name="place_scroll"
@@ -191,7 +191,7 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="540"
+         height="580"
          layout="topleft"
          left="0"
          min_height="300"
@@ -337,21 +337,22 @@
             <accordion
              fit_parent="true"
              follows="all"
-             height="223"
+             height="268"
              layout="topleft"
              single_expansion="true"
              left="0"
              name="advanced_info_accordion"
-             top_pad="10"
+             top_pad="5"
              width="313">
                 <accordion_tab
-                 height="170"
+                 fit_panel="false"
+                 height="175"
                  layout="topleft"
                  name="parcel_characteristics_tab"
                  title="Parcel">
                     <panel
                      follows="all"
-                     height="160"
+                     height="175"
                      layout="topleft"
                      left="0"
                      name="parcel_characteristics_panel"
@@ -548,8 +549,8 @@
                          name="about_land_btn"
                          right="-5"
                          tab_stop="false"
-                         top="138"
-                         width="90">
+                         top_pad="2"
+                         width="140">
                             <click_callback
                              function="Floater.Show"
                              parameter="about_land" />
@@ -558,7 +559,8 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
-                 height="150"
+                 fit_panel="false"
+                 height="125"
                  layout="topleft"
                  name="region_information_tab"
                  title="Region">
@@ -677,7 +679,8 @@
                          name="region_info_btn"
                          right="-5"
                          tab_stop="false"
-                         width="105">
+                         top_pad="2"
+                         width="180">
                             <click_callback
                              function="Floater.Show"
                              parameter="region_info" />
@@ -686,13 +689,14 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
-                 height="190"
+                 fit_panel="false"
+                 height="180"
                  layout="topleft"
                  name="estate_information_tab"
                  title="Estate">
                     <panel
                      follows="all"
-                     height="189"
+                     height="180"
                      layout="topleft"
                      left="0"
                      name="estate_information_panel"
@@ -775,13 +779,14 @@
                 </accordion_tab>
                 <accordion_tab
                  expanded="false"
-                 height="320"
+                 fit_panel="false"
+                 height="290"
                  layout="topleft"
                  name="sales_tab"
                  title="For Sale">
                     <panel
                      follows="all"
-                     height="300"
+                     height="290"
                      layout="topleft"
                      left="0"
                      name="sales_panel"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 1c68d59993..a69e8d29b0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -348,7 +348,7 @@
        Busy mode response:
     </text>
     <text_editor
-     control_name="BusyModeResponse2"
+     control_name="BusyModeResponse"
       text_readonly_color="LabelDisabledColor"
       bg_writeable_color="LtGray"
       use_ellipses="false"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 3d7b0b7edc..ae08a13793 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -111,6 +111,7 @@ width="333">
    label="Filter Outfits"
    max_length="300"
    name="Filter"
+   search_button_visible="true"
    top_pad="10"
    width="303" />
    <panel
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index c816fd1479..b736f5e29c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -395,7 +395,7 @@ top_pad="10"
 			    label_width="75"
 			    left="120"
 			    width="170"
-			    min_val="1"
+			    min_val="0"
 			    height="23"
 			    max_val="999999999"
 			    top_pad="10"/>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0d14a6b3c8..294267d43b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3181,12 +3181,12 @@ Abuse Report</string>
 
   <!-- language specific white-space characters, delimiters, spacers, item separation symbols -->
   <string name="sentences_separator" value=" "></string>
-  <string name="words_separator">, </string>
+  <string name="words_separator" value=", "/>
   
   <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 status.secondlifegrid.net 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>
 
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
new file mode 100644
index 0000000000..05d7447a6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<accordion
+ height="100"
+ name="accordion"
+ width="200">
+    <empty_accordion_text
+     follows="all"
+     height="100"
+     h_pad="10"
+     name="no_visible_items_msg"
+     v_pad="15"
+     width="200"
+     wrap="true "/>
+</accordion>
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index dfd301a770..48b987d7e8 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -4,5 +4,6 @@
               name="color_swatch">
   <color_swatch.caption_text name="caption"
                              halign="center"
-                             follows="left|right|bottom"/>
+                             follows="left|right|bottom"
+                             v_pad="2"/>
 </color_swatch>
diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
index 33c3475eb2..757f0f49d1 100644
--- a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
+++ b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
@@ -3,7 +3,8 @@
   <multiselect_text font="SansSerifSmall"/>
   <caption_text text="Multiple" 
                 halign="center" 
-                font="SansSerifSmall"/>
+                font="SansSerifSmall"
+                v_pad="2"/>
   <border bevel_style="in"/>
 </texture_picker>