Reverted changeset 2bb10eae42bf

12 files changed, 32 insertions, 322 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index da2be18db6..8c3aa2c9a4 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -71,8 +71,7 @@
             image_name="Cam_Preset_Front_Off" />
           <panel_camera_item.selected_picture
             image_name="Cam_Preset_Front_On" />
-          <panel_camera_item.text
-            name="front_view_text">
+          <panel_camera_item.text>
             Front View
           </panel_camera_item.text>
         </panel_camera_item>
@@ -86,8 +85,7 @@
             image_name="Cam_Preset_Side_Off" />
           <panel_camera_item.selected_picture
             image_name="Cam_Preset_Side_On" />
-          <panel_camera_item.text
-            name="side_view_text">
+          <panel_camera_item.text>
             Side View
           </panel_camera_item.text>
         </panel_camera_item>
@@ -102,8 +100,7 @@
             image_name="Cam_Preset_Back_Off" />
           <panel_camera_item.selected_picture
             image_name="Cam_Preset_Back_On" />
-          <panel_camera_item.text
-            name="rear_view_text">
+          <panel_camera_item.text>
             Rear View
           </panel_camera_item.text>
         </panel_camera_item>
@@ -125,8 +122,7 @@
           <panel_camera_item.mousedown_callback
             function="CameraPresets.ChangeView"
             parameter="object_view" />
-          <panel_camera_item.text
-            name="object_view_text">
+          <panel_camera_item.text>
             Object View
           </panel_camera_item.text>
           <panel_camera_item.picture
@@ -140,8 +136,7 @@
           <panel_camera_item.mousedown_callback
             function="CameraPresets.ChangeView"
             parameter="mouselook_view" />
-          <panel_camera_item.text
-            name="mouselook_view_text">
+          <panel_camera_item.text>
             Mouselook View
           </panel_camera_item.text>
           <panel_camera_item.picture
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index ae98abf4fb..5ad099e2d9 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -50,13 +50,8 @@
                      function="File.UploadBulk"
                      parameter="" />
                 </menu_item_call>
-	            <menu_item_call
-	             label="Set Default Upload Permissions"
-	             name="perm prefs">
-	                <menu_item_call.on_click
-	                 function="Floater.Toggle"
-	                 parameter="perm_prefs" />
-	            </menu_item_call>
+                <menu_item_separator
+                 layout="topleft" />
             </menu>
 
             <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 63ff7047b4..3557318705 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -707,6 +707,13 @@
          label="Options"
          name="Options"
          tear_off="true">
+            <menu_item_call
+             label="Set Default Upload Permissions"
+             name="perm prefs">
+                <menu_item_call.on_click
+                 function="Floater.Toggle"
+                 parameter="perm_prefs" />
+            </menu_item_call>
 	   <menu_item_check
 	       label="Show Advanced Permissions"
 	       name="DebugPermissions">
@@ -866,13 +873,8 @@
                  function="File.UploadBulk"
                  parameter="" />
             </menu_item_call>
-            <menu_item_call
-             label="Set Default Upload Permissions"
-             name="perm prefs">
-                <menu_item_call.on_click
-                 function="Floater.Toggle"
-                 parameter="perm_prefs" />
-            </menu_item_call>
+            <menu_item_separator
+             layout="topleft" />
         </menu>
     </menu>
     <menu
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 04bdb4302c..04a8a02ecd 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -819,7 +819,7 @@ Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
    icon="alertmodal.tga"
    name="DeleteOutfits"
    type="alertmodal">
-    Delete the selected outfit?
+    Delete the selected outfit/s?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -5493,6 +5493,7 @@ 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]?
 
@@ -5592,6 +5593,7 @@ Grant this request?
   <notification
    icon="notify.tga"
    name="ScriptDialog"
+   persist="true"
    type="notify">
 [FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
 [MESSAGE]
@@ -5606,6 +5608,7 @@ 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_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index 584ca8b3b5..d8675b3512 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -104,7 +104,6 @@
 		follows="top|left"
 		font="SansSerif"
 		left="10"
-		name="nearby_media_title"
 		width="100">
 	  Nearby Media
 	</text>
@@ -115,7 +114,6 @@
 		font="SansSerif"
 		top_pad="15"
 		left="10"
-		name="show_text"
 		width="40">
 	  Show:
 	</text>
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index d18f0d57ca..b43aa0a824 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -14,9 +14,9 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      bg_opaque_color="DkGray2"
-     no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
+     no_matched_tabs_text.value="NoOutfitsTabsMatched"
      no_matched_tabs_text.v_pad="10"
-     no_visible_tabs_text.value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"
+     no_visible_tabs_text.value="NoOutfits"
      follows="all"
      height="400"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b91acbe27d..0c31fda68b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1956,9 +1956,6 @@ Clears (deletes) the media and all params from the given face.
 	<string name="InvFolder Animations">Animations</string>
 	<string name="InvFolder Gestures">Gestures</string>
 	<string name="InvFolder Favorite">Favorites</string>
-  <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
-  We should localize both of them with the same value -->
-	<string name="InvFolder favorite">Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
 	<string name="InvFolder Accessories">Accessories</string>
@@ -2197,6 +2194,10 @@ Clears (deletes) the media and all params from the given face.
   <!-- 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>
 
+	<!-- Outfits Panel -->
+	<string name="NoOutfits">You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]</string>
+	<string name="NoOutfitsTabsMatched">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string>
+
 	<!-- Mute -->
 	<string name="MuteByName">(By name)</string>
 	<string name="MuteAgent">(Resident)</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
deleted file mode 100644
index c08267de82..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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
deleted file mode 100644
index f7a05e9bc4..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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
deleted file mode 100644
index 88a4682e13..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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
deleted file mode 100644
index 80a877a6c2..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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 0a5930c820..50be0ac1a1 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,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <inventory_list_item
-  follows="top|right|left"
-  height="20"
-  name="inventory_item"
-  tab_stop="false" 
-  hover_image="ListItem_Over"
-  selected_image="ListItem_Select"
-  separator_image="Wearables_Divider" 
-  width="380">
+ height="0"
+ layout="topleft"
+ left="0"
+ name="inventory_list_item"
+ top="0"
+ width="0">
   <!-- DEFAULT style for inventory list item -->
   <default_style
    font="SansSerifSmall"
@@ -18,25 +16,4 @@
    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>