Merged from viewer-release

12 files changed, 291 insertions, 460 deletions

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 04a8a02ecd..60d3fb708e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5493,7 +5493,6 @@ If you stay in this region you will be logged out.
   <notification
    icon="notify.tga"
    name="LoadWebPage"
-   persist="true"
    type="notify">
 Load web page [URL]?
 
@@ -5593,7 +5592,6 @@ Grant this request?
   <notification
    icon="notify.tga"
    name="ScriptDialog"
-   persist="true"
    type="notify">
 [FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
@@ -5608,7 +5606,6 @@ Grant this request?
   <notification
    icon="notify.tga"
    name="ScriptDialogGroup"
-   persist="true"
    type="notify">
 [GROUPNAME]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
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
deleted file mode 100644
index 4f989a6f6f..0000000000
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="top|right|left"
- height="23"
- layout="topleft"
- left="0"
- name="wearable_item"
- top="0"
- width="380">
-    <icon
-     follows="top|right|left"
-     height="22"
-     image_name="ListItem_Over"
-     layout="topleft"
-     left="0"
-     name="hovered_icon"
-     top="1"
-     visible="false"
-     width="380" />
-    <icon
-     height="22"
-     follows="top|right|left"
-     image_name="ListItem_Select"
-     layout="topleft"
-     left="0"
-     name="selected_icon"
-     top="1"
-     visible="false"
-     width="380" />
-    <icon
-     height="16"
-     follows="top|left"
-     image_name="Inv_Object"
-     layout="topleft"
-     left="0"
-     name="item_icon"
-     top="2"
-     width="16" />
-    <text
-     follows="left|right"
-     height="16"
-     layout="topleft"
-     left_pad="5"
-     allow_html="false"
-     use_ellipses="true"
-     name="item_name"
-     text_color="white"
-     top="5"
-     value="..."
-     width="359" />
-    <panel
-     background_visible="false"
-     name="btn_lock"
-     layout="topleft"
-     follows="top|right"
-     top="0"
-     left="0"
-     height="23"
-     width="23"
-     tab_stop="false"
-     tool_tip="You don't have permission to edit">
-        <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>
-    <panel
-     background_visible="false"
-     name="btn_edit_panel"
-     layout="topleft"
-     follows="top|right"
-     top="1"
-     left_pad="3"
-     height="23"
-     width="26"
-     tab_stop="false">
-         <button 
-          name="btn_edit"
-          layout="topleft"
-          follows="top|right"
-          image_overlay="Edit_Wrench"
-          top="0"
-          left="0"
-          height="23"
-          width="23"
-          tab_stop="false"
-          tool_tip="Edit this shape"/>
-      </panel>
-    <icon
-     follows="left|right|top"
-     height="3"
-     image_name="Wearables_Divider"
-     layout="bottomleft"
-     left="0"
-     name="wearable_type_separator_icon"
-     top="0"
-     visible="true"
-     width="380"/>
-</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
deleted file mode 100644
index 93d7720c57..0000000000
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="top|right|left"
- height="23"
- layout="topleft"
- left="0"
- name="wearable_item"
- top="0"
- width="380">
-    <icon
-     follows="top|right|left"
-     height="22"
-     image_name="ListItem_Over"
-     layout="topleft"
-     left="0"
-     name="hovered_icon"
-     top="1"
-     visible="false"
-     width="380" />
-    <icon
-     height="22"
-     follows="top|right|left"
-     image_name="ListItem_Select"
-     layout="topleft"
-     left="0"
-     name="selected_icon"
-     top="1"
-     visible="false"
-     width="380" />
-    <button 
-     name="btn_delete"
-     layout="topleft"
-     follows="top|left"
-     image_unselected="Toast_CloseBtn"
-     image_selected="Toast_CloseBtn"
-     top="3"
-     left="0"
-     height="18"
-     width="18"
-     tab_stop="false"
-     tool_tip="Remove from outfit" />
-    <icon
-     height="16"
-     follows="top|left"
-     image_name="Inv_Object"
-     layout="topleft"
-     left_pad="3"
-     name="item_icon"
-     top="2"
-     width="16" />
-    <text
-     follows="left|right"
-     height="16"
-     layout="topleft"
-     left_pad="5"
-     allow_html="false"
-     use_ellipses="true"
-     name="item_name"
-     text_color="white"
-     top="5"
-     value="..."
-     width="359" />
-    <button 
-     name="btn_move_up"
-     layout="topleft"
-     follows="top|right"
-     image_overlay="UpArrow_Off"
-     top="1"
-     left="0"
-     height="23"
-     width="23"
-     tab_stop="false" />
-    <button 
-     name="btn_move_down"
-     layout="topleft"
-     follows="top|right"
-     image_overlay="DownArrow_Off"
-     top="1"
-     left_pad="3"
-     height="23"
-     width="23"
-     tab_stop="false" />
-    <panel
-     background_visible="false"
-     name="btn_lock"
-     layout="topleft"
-     follows="top|right"
-     top="0"
-     left="0"
-     height="23"
-     width="23"
-     tab_stop="false"
-     tool_tip="You don't have permission to edit">
-        <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>
-    <panel
-     background_visible="false"
-     name="btn_edit_panel"
-     layout="topleft"
-     follows="top|right"
-     top="0"
-     left_pad="3"
-     height="23"
-     width="26"
-     tab_stop="false">
-        <button 
-         name="btn_edit"
-         layout="topleft"
-         follows="top|right"
-         image_overlay="Edit_Wrench"
-         top="1"
-         left="0"
-         height="23"
-         width="23"
-         tab_stop="false"
-         tool_tip="Edit this wearable"/>
-      </panel>
-    <icon
-     follows="left|right|top"
-     height="3"
-     image_name="Wearables_Divider"
-     layout="bottomleft"
-     left="0"
-     name="wearable_type_separator_icon"
-     top="0"
-     visible="false"
-     width="380"/>
-</panel>
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
deleted file mode 100644
index 75b5fd1532..0000000000
--- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="top|right|left"
- height="23"
- layout="topleft"
- left="0"
- name="deletable_wearable_item"
- top="0"
- width="380">
-    <icon
-     follows="top|right|left"
-     height="22"
-     image_name="ListItem_Over"
-     layout="topleft"
-     left="0"
-     name="hovered_icon"
-     top="1"
-     visible="false"
-     width="380" />
-    <icon
-     height="22"
-     follows="top|right|left"
-     image_name="ListItem_Select"
-     layout="topleft"
-     left="0"
-     name="selected_icon"
-     top="1"
-     visible="false"
-     width="380" />
-    <button 
-     name="btn_delete"
-     layout="topleft"
-     follows="top|left"
-     image_unselected="Toast_CloseBtn"
-     image_selected="Toast_CloseBtn"
-     top="3"
-     left="0"
-     height="18"
-     width="18"
-     tab_stop="false"
-     tool_tip="Remove from outfit"/>
-    <icon
-     height="16"
-     follows="top|left"
-     image_name="Inv_Object"
-     layout="topleft"
-     left_pad="3"
-     name="item_icon"
-     top="2"
-     width="16" />
-    <text
-     follows="left|right"
-     height="16"
-     layout="topleft"
-     left_pad="5"
-     allow_html="false"
-     use_ellipses="true"
-     name="item_name"
-     text_color="white"
-     top="5"
-     value="..."
-     width="359" />
-    <icon
-     follows="left|right|top"
-     height="3"
-     image_name="Wearables_Divider"
-     layout="bottomleft"
-     left="0"
-     name="wearable_type_separator_icon"
-     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
deleted file mode 100644
index a5dd34bd22..0000000000
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="top|right|left"
- height="23"
- layout="topleft"
- left="0"
- name="dummy_clothing_item"
- top="0"
- width="380">
-    <icon
-     follows="top|right|left"
-     height="22"
-     image_name="ListItem_Over"
-     layout="topleft"
-     left="0"
-     name="hovered_icon"
-     top="1"
-     visible="false"
-     width="380" />
-    <icon
-     height="22"
-     follows="top|right|left"
-     image_name="ListItem_Select"
-     layout="topleft"
-     left="0"
-     name="selected_icon"
-     top="1"
-     visible="false"
-     width="380" />
-    <icon
-     height="16"
-     color="0.75 0.75 0.75 1"
-     follows="top|left"
-     image_name="Inv_Object"
-     layout="topleft"
-     left="20"
-     name="item_icon"
-     top="2"
-     width="16" />
-    <text
-     follows="left|right"
-     height="16"
-     layout="topleft"
-     left_pad="5"
-     allow_html="false"
-     use_ellipses="true"
-     name="item_name"
-     text_color="LtGray_50"
-     top="4"
-     value="..."
-     width="359" />
-    <panel
-     name="btn_add_panel"
-     layout="topleft"
-     follows="top|right"
-     top="0"
-     left="0"
-     height="23"
-     width="26"
-     tab_stop="false">
-      <button 
-       name="btn_add"
-       layout="topleft"
-       follows="top|right"
-       image_overlay="AddItem_Off"
-       top="0"
-       left="0"
-       height="23"
-       width="23"
-       tab_stop="false"
-       tool_tip="Add more items of this type" />
-    </panel>
-    <icon
-     follows="left|right|top"
-     height="3"
-     image_name="Wearables_Divider"
-     layout="bottomleft"
-     left="0"
-     name="wearable_type_separator_icon"
-     top="0"
-     visible="true"
-     width="380"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
deleted file mode 100644
index f1b7b92ece..0000000000
--- a/indra/newview/skins/default/xui/en/panel_inventory_item.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="top|right|left"
- height="20"
- layout="topleft"
- left="0"
- name="inventory_item"
- top="0"
- width="380">
-    <icon
-     follows="top|right|left"
-     height="20"
-     image_name="ListItem_Over"
-     layout="topleft"
-     left="0"
-     name="hovered_icon"
-     top="0"
-     visible="false"
-     width="380" />
-    <icon
-     height="20"
-     follows="top|right|left"
-     image_name="ListItem_Select"
-     layout="topleft"
-     left="0"
-     name="selected_icon"
-     top="0"
-     visible="false"
-     width="380" />
-    <icon
-     height="16"
-     follows="top|left"
-     image_name="Inv_Object"
-     layout="topleft"
-     left="0"
-     name="item_icon"
-     top="0"
-     width="16" />
-    <text
-     follows="left|right"
-     height="20"
-     layout="topleft"
-     left_pad="5"
-     allow_html="false"
-     use_ellipses="true"
-     name="item_name"
-     text_color="white"
-     top="4"
-     value="..."
-     width="359" />
-</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ece57a6682..0c31fda68b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2189,8 +2189,7 @@ Clears (deletes) the media and all params from the given face.
 
 	<!-- panel contents -->
 	<string name="PanelContentsTooltip">Content of object</string>
-	<string name="PanelContentsNewScript">New Script</string>
-	<string name="PanelContentsTooltip">Content of object</string>
+	<string name="PanelContentsNewScript">New Script</string>	
 
   <!-- panel preferences general -->
   <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
new file mode 100644
index 0000000000..c08267de82
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<bodyparts_list_item
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="wearable_item"
+ bottom="0"
+ width="380">
+  <item_icon
+   height="16"
+   follows="top|left"
+   image_name="Inv_Object"
+   layout="topleft"
+   left="0"
+   name="item_icon"
+   top="2"
+   width="16" />
+  <item_name
+   follows="left|right"
+   height="16"
+   layout="topleft"
+   left="21"
+   allow_html="false"
+   use_ellipses="true"
+   name="item_name"
+   text_color="white"
+   top="5"
+   value="..."
+   width="359" />
+  <lock_panel
+   background_visible="false"
+   name="btn_lock"
+   layout="topleft"
+   follows="top|right"
+   top="0"
+   left="0"
+   height="23"
+   width="23"
+   tab_stop="false"
+   tool_tip="You don't have permission to edit"/>
+  <lock_icon
+   name="btn_lock1"
+   layout="topleft"
+   follows="top|right"
+   image_name="Locked_Icon"
+   top="2"
+   left="5"
+   height="13"
+   width="9"
+   tab_stop="false" />
+  <edit_panel
+   background_visible="false"
+   name="btn_edit_panel"
+   layout="topleft"
+   follows="top|right"
+   top="1"
+   left="17"
+   height="23"
+   width="26"
+   tab_stop="false"/>
+  <edit_btn
+   name="btn_edit"
+   layout="topleft"
+   follows="top|right"
+   image_overlay="Edit_Wrench"
+   top="0"
+   left="0"
+   height="23"
+   width="23"
+   tab_stop="false"
+   tool_tip="Edit this shape"/>
+</bodyparts_list_item>
diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
new file mode 100644
index 0000000000..f7a05e9bc4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<clothing_list_item
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="wearable_item"
+ bottom="0"
+ width="380">
+  <lock_icon
+   height="16"
+   follows="top|left"
+   image_name="Inv_Object"
+   layout="topleft"
+   left="21"
+   name="item_icon"
+   top="2"
+   width="16" />
+  <item_name
+   follows="left|right"
+   height="16"
+   layout="topleft"
+   left="42"
+   allow_html="false"
+   use_ellipses="true"
+   name="item_name"
+   text_color="white"
+   top="5"
+   value="..."
+   width="359" />
+  <up_btn
+   name="btn_move_up"
+   layout="topleft"
+   follows="top|right"
+   image_overlay="UpArrow_Off"
+   top="1"
+   left="0"
+   height="23"
+   width="23"
+   tab_stop="false" />
+  <down_btn
+   name="btn_move_down"
+   layout="topleft"
+   follows="top|right"
+   image_overlay="DownArrow_Off"
+   top="1"
+   left="26"
+   height="23"
+   width="23"
+   tab_stop="false" />
+  <lock_panel
+   background_visible="false"
+   name="btn_lock"
+   layout="topleft"
+   follows="top|right"
+   top="0"
+   left="0"
+   height="23"
+   width="23"
+   tab_stop="false"
+   tool_tip="You don't have permission to edit"/>
+  <lock_icon
+   name="btn_lock1"
+   layout="topleft"
+   follows="top|right"
+   image_name="Locked_Icon"
+   top="2"
+   left="5"
+   height="13"
+   width="9"
+   tab_stop="false" />
+  <edit_panel
+   background_visible="false"
+   name="btn_edit_panel"
+   layout="topleft"
+   follows="top|right"
+   top="0"
+   left="26"
+   height="23"
+   width="26"
+   tab_stop="false"/>
+  <edit_btn
+   name="btn_edit"
+   layout="topleft"
+   follows="top|right"
+   image_overlay="Edit_Wrench"
+   top="1"
+   left="0"
+   height="23"
+   width="23"
+   tab_stop="false"
+   tool_tip="Edit this wearable"/>
+</clothing_list_item>
diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
new file mode 100644
index 0000000000..88a4682e13
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<deletable_wearable_list_item
+  follows="top|right|left"
+  height="23"
+  layout="topleft"
+  left="0"
+  name="deletable_wearable_item"
+  bottom="0"
+  width="380">
+  <delete_btn
+  name="btn_delete"
+  layout="topleft"
+  follows="top|left"
+  image_unselected="Toast_CloseBtn"
+  image_selected="Toast_CloseBtn"
+  top="3"
+  left="0"
+  height="18"
+  width="18"
+  tab_stop="false"
+  tool_tip="Remove from outfit"/>
+  <item_icon
+   height="16"
+   follows="top|left"
+   image_name="Inv_Object"
+   layout="topleft"
+   left="24"
+   name="item_icon"
+   top="2"
+   width="16" />
+  <item_name
+   follows="left|right"
+   height="16"
+   layout="topleft"
+   left="45"
+   allow_html="false"
+   use_ellipses="true"
+   name="item_name"
+   text_color="white"
+   top="5"
+   value="..."
+   width="359" />
+</deletable_wearable_list_item>
diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
new file mode 100644
index 0000000000..80a877a6c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<dummy_clothing_list_item
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="dummy_clothing_item"
+ bottom="0"
+ width="380">
+  <item_icon
+    height="16"
+    color="0.75 0.75 0.75 1"
+    follows="top|left"
+    image_name="Inv_Object"
+    layout="topleft"
+    left="20"
+    name="item_icon"
+    top="2"
+    width="16" />
+  <item_name
+    follows="left|right"
+    height="16"
+    layout="topleft"
+    left="41"
+    allow_html="false"
+    use_ellipses="true"
+    name="item_name"
+    text_color="LtGray_50"
+    top="4"
+    value="..."
+    width="359" />
+  <add_panel
+    name="btn_add_panel"
+    layout="topleft"
+    follows="top|right"
+    top="0"
+    left="0"
+    height="23"
+    width="26"
+    tab_stop="false"/>
+  <add_btn
+     name="btn_add"
+     layout="topleft"
+     follows="top|right"
+     image_overlay="AddItem_Off"
+     top="0"
+     left="0"
+     height="23"
+     width="23"
+     tab_stop="false"
+     tool_tip="Add more items of this type" />
+</dummy_clothing_list_item>
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
index 50be0ac1a1..4e7e2873b5 100644
--- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inventory_list_item
- height="0"
- layout="topleft"
- left="0"
- name="inventory_list_item"
- top="0"
- width="0">
+  follows="top|right|left"
+  height="20"
+  name="inventory_item"
+  tab_stop="false" 
+  hover_image="ListItem_Over" 
+  selected_name="ListItem_Select"
+  separator_image="Wearables_Divider" 
+  width="380">
   <!-- DEFAULT style for inventory list item -->
   <default_style
    font="SansSerifSmall"
@@ -16,4 +18,25 @@
    font="SansSerifSmall"
    font.style="BOLD"
    color="EmphasisColor" />
+  <item_icon
+    height="16"
+    follows="top|left"
+    image_name="Inv_Object"
+    layout="topleft"
+    left="0"
+    name="item_icon"
+    top="0"
+    width="16" />
+  <item_name
+    follows="left|right"
+    height="20"
+    layout="topleft"
+    left="21"
+    allow_html="false"
+    use_ellipses="true"
+    name="item_name"
+    text_color="white"
+    top="4"
+    value="..."
+    width="359" />
 </inventory_list_item>