Merge branch 'main' into DRTVWR-587-maint-V

# Conflicts:
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llvovolume.cpp

65 files changed, 2181 insertions, 1740 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 6efe302f30..92f63a1820 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -407,7 +407,7 @@
      value="0.43 0.06 0.06 1" />
     <color
      name="HTMLLinkColor"
-     reference="EmphasisColor" />
+     value="0.3 0.82 1 1" />
     <color
      name="HealthTextColor"
      reference="White" />
diff --git a/indra/newview/skins/default/textures/icons/copy_clipboard.png b/indra/newview/skins/default/textures/icons/copy_clipboard.png
new file mode 100644
index 0000000000..bb1ceff1ce
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/copy_clipboard.png
diff --git a/indra/newview/skins/default/textures/icons/delete_icon.png b/indra/newview/skins/default/textures/icons/delete_icon.png
new file mode 100644
index 0000000000..37ce374653
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/delete_icon.png
diff --git a/indra/newview/skins/default/textures/icons/file_upload.png b/indra/newview/skins/default/textures/icons/file_upload.png
new file mode 100644
index 0000000000..58f2757136
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/file_upload.png
diff --git a/indra/newview/skins/default/textures/icons/multi_folder_mode.png b/indra/newview/skins/default/textures/icons/multi_folder_mode.png
new file mode 100644
index 0000000000..8cda3efc36
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/multi_folder_mode.png
diff --git a/indra/newview/skins/default/textures/icons/paste_clipboard.png b/indra/newview/skins/default/textures/icons/paste_clipboard.png
new file mode 100644
index 0000000000..e1589ab098
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/paste_clipboard.png
diff --git a/indra/newview/skins/default/textures/icons/single_folder_back.png b/indra/newview/skins/default/textures/icons/single_folder_back.png
new file mode 100644
index 0000000000..b614e9ef9b
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/single_folder_back.png
diff --git a/indra/newview/skins/default/textures/icons/single_folder_forward.png b/indra/newview/skins/default/textures/icons/single_folder_forward.png
new file mode 100644
index 0000000000..c7bee3522d
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/single_folder_forward.png
diff --git a/indra/newview/skins/default/textures/icons/single_folder_mode.png b/indra/newview/skins/default/textures/icons/single_folder_mode.png
new file mode 100644
index 0000000000..f70b754123
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/single_folder_mode.png
diff --git a/indra/newview/skins/default/textures/icons/single_folder_up.png b/indra/newview/skins/default/textures/icons/single_folder_up.png
new file mode 100644
index 0000000000..651b2b1af1
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/single_folder_up.png
diff --git a/indra/newview/skins/default/textures/icons/snapshot_icon.png b/indra/newview/skins/default/textures/icons/snapshot_icon.png
new file mode 100644
index 0000000000..41d524678f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/snapshot_icon.png
diff --git a/indra/newview/skins/default/textures/icons/texture_icon.png b/indra/newview/skins/default/textures/icons/texture_icon.png
new file mode 100644
index 0000000000..278760a5b0
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/texture_icon.png
diff --git a/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png b/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png
new file mode 100644
index 0000000000..8d5ca624af
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/thumbnail_fallback_icon.png
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 7d999a2ffa..aa99fe38cd 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -253,10 +253,16 @@ with the same filename but different name
   <texture name="Icon_Close_Foreground" file_name="windows/Icon_Close_Foreground.png" preload="true" />
   <texture name="Icon_Close_Press" file_name="windows/Icon_Close_Press.png" preload="true" />
   <texture name="Icon_Close_Toast" file_name="windows/Icon_Close_Toast.png" preload="true" />
+  
+  <texture name="Icon_Copy" file_name="icons/copy_clipboard.png" preload="true" />
+  
+  <texture name="Icon_Delete" file_name="icons/delete_icon.png" preload="true" />
 
   <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
+  <texture name="Icon_File_Upload" file_name="icons/file_upload.png" preload="true" />
+  
   <texture name="Icon_For_Sale" file_name="icons/Icon_For_Sale.png" preload="false" />
 
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
@@ -269,10 +275,16 @@ with the same filename but different name
 
   <texture name="Icon_Minimize_Foreground" file_name="windows/Icon_Minimize_Foreground.png" preload="true" />
   <texture name="Icon_Minimize_Press" file_name="windows/Icon_Minimize_Press.png" preload="true" />
+  
+  <texture name="Icon_Paste" file_name="icons/paste_clipboard.png" preload="true" />
 
   <texture name="Icon_Restore_Foreground" file_name="windows/Icon_Restore_Foreground.png" preload="false" />
   <texture name="Icon_Restore_Press" file_name="windows/Icon_Restore_Press.png" preload="false" />
 
+  <texture name="Icon_Snapshot" file_name="icons/snapshot_icon.png" preload="true" />
+  
+  <texture name="Icon_Use_Texture" file_name="icons/texture_icon.png" preload="true" />
+
   <texture name="Info" file_name="icons/Info.png" preload="false" />
   <texture name="Info_Small" file_name="icons/Info_Small.png" preload="false" />
   <texture name="Info_Off" file_name="navbar/Info_Off.png" preload="false" />
@@ -685,6 +697,7 @@ with the same filename but different name
   <texture name="TextField_Active" file_name="widgets/TextField_Active.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="TextField_Search_Highlight" file_name="widgets/TextField_Search_Highlight.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
+  <texture name="Thumbnail_Fallback" file_name="icons/thumbnail_fallback_icon.png" preload="true" />
 
   <texture name="Toast_CloseBtn" file_name="windows/Toast_CloseBtn.png" preload="true" />
   <texture name="Toast_Background" file_name="windows/Toast_Background.png" preload="true"
@@ -881,4 +894,10 @@ with the same filename but different name
   <texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
   <texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png"	preload="true"/>
   <texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png"	preload="true"/>
+
+  <texture name="Single_Folder_Mode" file_name="icons/single_folder_mode.png" preload="true"/>
+  <texture name="Multi_Folder_Mode" file_name="icons/multi_folder_mode.png" preload="true"/>
+  <texture name="Single_Folder_Back" file_name="icons/single_folder_back.png" preload="true"/>
+  <texture name="Single_Folder_Forward" file_name="icons/single_folder_forward.png" preload="true"/>
+  <texture name="Single_Folder_Up" file_name="icons/single_folder_up.png" preload="true"/>
 </textures>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
deleted file mode 100644
index 59dcc87140..0000000000
--- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="OPLYSNINGER OM BEHOLDNINGSGENSTAND">
-	<floater.string name="unknown">
-		(ukendt)
-	</floater.string>
-	<floater.string name="public">
-		(offentlig)
-	</floater.string>
-	<floater.string name="you_can">
-		Du kan:
-	</floater.string>
-	<floater.string name="owner_can">
-		Ejer kan:
-	</floater.string>
-	<floater.string name="acquiredDate">
-		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
-	</floater.string>
-	<text name="LabelItemNameTitle">
-		Navn:
-	</text>
-	<text name="LabelItemDescTitle">
-		Beskrivelse:
-	</text>
-	<text name="LabelCreatorTitle">
-		Skaber:
-	</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">
-		Ejer:
-	</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">
-		Erhvervet:
-	</text>
-	<text name="LabelAcquiredDate">
-		Wed May 24 12:50:46 2006
-	</text>
-	<text name="OwnerLabel">
-		Dig:
-	</text>
-	<check_box label="Redigér" name="CheckOwnerModify"/>
-	<check_box label="Kopiere" name="CheckOwnerCopy"/>
-	<check_box label="Sælg" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">
-		Enhver:
-	</text>
-	<check_box label="Kopiér" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">
-		Gruppe:
-	</text>
-	<check_box label="Del" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">
-		Næste ejer:
-	</text>
-	<check_box label="Redigér" name="CheckNextOwnerModify"/>
-	<check_box label="Kopiere" name="CheckNextOwnerCopy"/>
-	<check_box label="Sælg" name="CheckNextOwnerTransfer"/>
-	<check_box label="Til salg" name="CheckPurchase"/>
-	<combo_box name="combobox sale copy">
-		<combo_box.item label="Kopiér" name="Copy"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Pris:" name="Edit Cost"/>
-	<text name="CurrencySymbol">
-		L$
-	</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
deleted file mode 100644
index 92c038057f..0000000000
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="EIGENSCHAFTEN: INVENTAROBJEKT">
-	<floater.string name="unknown">(unbekannt)</floater.string>
-	<floater.string name="public">(öffentlich)</floater.string>
-	<floater.string name="you_can">Sie können:</floater.string>
-	<floater.string name="owner_can">Eigentümer kann:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Name:</text>
-	<text name="LabelItemDescTitle">Beschreibung:</text>
-	<text name="LabelCreatorTitle">Ersteller:</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Eigentümer:</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Erworben:</text>
-	<text name="LabelAcquiredDate">Mittwoch, 24. Mai 2006, 12:50:46</text>
-	<text name="OwnerLabel">Sie:</text>
-	<check_box label="Bearbeiten" name="CheckOwnerModify"/>
-	<check_box label="Kopieren" left_delta="85" name="CheckOwnerCopy"/>
-	<check_box label="Wiederverkaufen" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Jeder:</text>
-	<check_box label="Kopieren" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Gruppe:</text>
-	<check_box label="Teilen" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="150">Nächster Eigentümer:</text>
-	<check_box label="Bearbeiten" name="CheckNextOwnerModify"/>
-	<check_box label="Kopieren" left_delta="55" name="CheckNextOwnerCopy"/>
-	<check_box label="Wiederverkaufen" name="CheckNextOwnerTransfer"/>
-	<check_box label="Zum Verkauf" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopie" name="Copy"/>
-		<combo_box.item label="Inhalt" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Preis:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
index a3adea9fa2..175f6e1003 100644
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Geholte [ITEM_COUNT] Bestellungen und [CATEGORY_COUNT] Ordner [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTAR</panel.string>
 	<text name="ItemcountText">
 		Objekte:
 	</text>
diff --git a/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
new file mode 100644
index 0000000000..726cb38481
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_change_item_thumbnail.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="false"
+ height="366"
+ layout="topleft"
+ name="change_item_thumbnail"
+ help_topic="change_item_thumbnail"
+ title="CHANGE ITEM IMAGE"
+ width="319">
+
+  <floater.string
+    name="title_item_thumbnail">
+    CHANGE ITEM IMAGE
+  </floater.string>
+  <floater.string
+    name="title_folder_thumbnail">
+    CHANGE FOLDER IMAGE
+  </floater.string>
+  <floater.string
+    name="tooltip_upload_local">
+    Upload from computer
+  </floater.string>
+  <floater.string
+    name="tooltip_upload_snapshot">
+    Use snapshot tool
+  </floater.string>
+  <floater.string
+    name="tooltip_use_texture">
+    Choose texture
+  </floater.string>
+  <floater.string
+    name="tooltip_copy_to_clipboard">
+    Copy to clipboard
+  </floater.string>
+  <floater.string
+    name="tooltip_paste_from_clipboard">
+    Paste from clipboard
+  </floater.string>
+  <floater.string
+    name="tooltip_remove_image">
+    Remove image
+  </floater.string>
+  
+  <icon
+    follows="top|left"
+    height="16"
+    image_name="Inv_Object"
+    layout="topleft"
+    left="10"
+    mouse_opaque="true"
+    name="item_type_icon"
+    top="4"
+    width="16" />
+  <text
+    name="item_name"
+    font="SansSerif"
+    use_ellipses="true"
+    follows="left|top|right"
+    layout="topleft"
+    height="19"
+    top_delta="1"
+    left_pad="3"
+    width="286"/>
+
+  <thumbnail
+    name="item_thumbnail"
+    fallback_image="Thumbnail_Fallback"
+    follows="top|left"
+    layout="topleft"
+    left="32"
+    top_pad="9"
+    height="256"
+    width="256"
+        />
+
+  <button
+    follows="right|bottom"
+    layout="topleft"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_File_Upload"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
+    name="upload_local"
+    left="38"
+    top_pad="9"
+    height="32"
+    width="32" />
+  <button
+    follows="right|bottom"
+    layout="topleft"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Snapshot"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
+    name="upload_snapshot"
+    left_pad="10"
+    top_delta="0"
+    height="32"
+    width="32" />
+  <button
+    follows="right|bottom"
+    layout="topleft"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Use_Texture"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
+    name="use_texture"
+    left_pad="10"
+    top_delta="0"
+    height="32"
+    width="32" />
+  <button
+    follows="right|bottom"
+    layout="topleft"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Copy"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
+    name="copy_to_clipboard"
+    left_pad="10"
+    top_delta="0"
+    height="32"
+    width="32" />
+  <button
+    follows="right|bottom"
+    layout="topleft"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Paste"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
+    name="paste_from_clipboard"
+    left_pad="10"
+    top_delta="0"
+    height="32"
+    width="32" />
+  <button
+    follows="right|bottom"
+    layout="topleft"
+    image_hover_unselected="Toolbar_Middle_Over"
+    image_overlay="Icon_Delete"
+    image_selected="Toolbar_Middle_Selected"
+    image_unselected="Toolbar_Middle_Off"
+    name="remove_image"
+    left_pad="10"
+    top_delta="0"
+    height="32"
+    width="32" />
+
+  <text
+    type="string"
+    halign="center"
+    length="1"
+    follows="left|top"
+    height="17"
+    layout="topleft"
+    left="5"
+    right="-5"
+    name="tooltip_text"
+    top_pad="12"
+    width="78">
+    tooltip
+  </text>
+  
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
new file mode 100644
index 0000000000..2e619d91fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_minimize="true"
+ can_resize="false"
+ save_rect="true"
+ height="370"
+ width="370"
+ name="inventory_settings"
+ title="INVENTORY SETTINGS">
+ <icon
+  follows="top|left"
+  height="18"
+  image_name="Multi_Folder_Mode"
+  layout="topleft"
+  left="18"
+  mouse_opaque="true"
+  name="multi_folder_icon"
+  top="25"
+  width="18" />
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="multi_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Double-click on folder in multi-folder view:
+ </text>
+ <radio_group
+  control_name="MultiModeDoubleClickFolder"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="300"
+  height="70"
+  name="multi_double_click_setting">
+     <radio_item
+      height="20"
+      label="Expands &amp; collapses folder"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="0"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="1"
+      top_pad ="5"
+      width="200" />
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Switches view"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="2"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <icon
+  follows="top|left"
+  height="18"
+  image_name="Single_Folder_Mode"
+  layout="topleft"
+  left="18"
+  mouse_opaque="true"
+  name="single_folder_icon"
+  top_pad="30"
+  width="18" />
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left_pad="12"
+   top_delta="2"
+   name="single_folder_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   width="300">
+   Double-click on folder in single-folder view:
+ </text>
+ <radio_group
+  control_name="SingleModeDoubleClickOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="300"
+  height="45"
+  name="single_double_click_setting">
+     <radio_item
+      height="20"
+      label="Stays in current window"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <text
+   type="string"
+   length="1"
+   follows="left|top|right"
+   height="13"
+   layout="topleft"
+   left="48"
+   name="find_original_txt"
+   font="SansSerifMedium"
+   text_color="White"
+   top_pad="30"
+   width="300">
+   Clicking on "Show in inventory" or "Find original"
+ </text>
+ <radio_group
+  control_name="FindOriginalOpenWindow"
+  follows="left|top"
+  top_pad="8"
+  layout="topleft"
+  font="SansSerifMedium"
+  left="60"
+  width="300"
+  height="45"
+  name="find_original_settings">
+     <radio_item
+      height="20"
+      label="Shows item in main inventory window"
+      label_text.text_color="White"
+      follows="left|top"
+      layout="topleft"
+      name="false"
+      width="200"/>
+     <radio_item
+      height="20"
+      follows="left|top"
+      label="Opens a new single-folder window"
+      label_text.text_color="White"
+      layout="topleft"
+      left_delta="0"
+      name="true"
+      top_pad ="5"
+      width="200" />
+ </radio_group>
+ <button
+  height="20"
+  label="OK"
+  layout="topleft"
+  left="140"
+  bottom="-20"
+  name="ok_btn"
+  label_color="White"
+  width="90" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_item_properties.xml b/indra/newview/skins/default/xui/en/floater_item_properties.xml
index 0fc54a9c8b..336bb902ca 100644
--- a/indra/newview/skins/default/xui/en/floater_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_item_properties.xml
@@ -13,7 +13,7 @@
    left="0"
    class="sidepanel_item_info"
    filename="sidepanel_item_info.xml"
-   name="item_panel"
+   name="sidepanel"
    top="20"
    label=""
    height="570"
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index f182d27da8..a9900f05b7 100644
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -5,14 +5,14 @@
  can_resize="true"
  height="570"
  help_topic="sidebar_inventory"
- min_width="333"
- min_height="590"
+ min_width="363"
+ min_height="270"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
  reuse_instance="true"
  title="INVENTORY"
- width="333" >
+ width="363" >
    <panel
     class="sidepanel_inventory"
     name="main_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
new file mode 100644
index 0000000000..5f0eeab71c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="130"
+ width="300"
+ layout="topleft"
+ name="floater_new_feature_notification"
+ title="NEW FEATURE"
+ show_title="false"
+ header_height="0"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ can_resize="false"
+ can_drag_on_left="false"
+ can_minimize="false"
+ can_close="false">
+    <floater.string name="title_txt_inventory">
+New inventory features
+    </floater.string>
+    <floater.string name="description_txt_inventory">
+You can now add preview images to inventory items and view a folder in its own window.
+Learn more in this [https://community.secondlife.com/blogs/entry/13637-new-features-inventory-item-preview-and-single-folder-view/ blogpost]
+    </floater.string>
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   font="SansSerifLargeBold"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="14"
+   top="10"
+   right="-10"
+   name="title_txt">
+New feature
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="top|left|right"
+   text_color="White"
+   layout="topleft"
+   left="10"
+   height="40"
+   top_pad="14"
+   right="-10"
+   word_wrap="true"
+   name="description_txt">
+Feature description
+  </text>
+  <button
+   follows="bottom|left|right"
+   layout="topleft"
+   height="24"
+   label="Got it!"
+   left="104"
+   bottom="-10"
+   name="close_btn"
+   width="90"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml b/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
deleted file mode 100644
index bfc1c39e9d..0000000000
--- a/indra/newview/skins/default/xui/en/floater_outfit_photo_preview.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="false"
- height="325"
- layout="topleft"
- name="outfit_photo_preview"
- help_topic="preview_texture"
- width="410">
-   <floater.string
-     name="Title">
-        Texture: [NAME]
-    </floater.string>
-    <floater.string
-     name="exceed_limits">
-        Max outfit photo size is [MAX_WIDTH]*[MAX_HEIGHT]. Please select another texture.
-    </floater.string>
-    <floater.string
-     name="photo_confirmation">
-         Set this as Outfit Photo for [OUTFIT]?
-    </floater.string>
-    <text
-     type="string"
-     halign="right"
-     length="1"
-     follows="right|bottom"
-     height="16"
-     layout="topleft"
-     left="110"
-     name="dimensions"
-     top="255"
-     width="200">
-        [WIDTH]px x [HEIGHT]px
-    </text>
-    <text
-     type="string"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     name="notification"
-     left="25"
-     halign="center"
-     top_pad="5"
-     width="360">
-    </text>
-    <button
-     follows="right|bottom"
-     height="22"
-     label="OK"
-     layout="topleft"
-     name="ok_btn"
-     top_pad="5"
-     right="-115"
-     top_delta="0"
-     width="90" />
-    <button
-     follows="right|bottom"
-     height="22"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     right="-20"
-     top_delta="0"
-     width="90" />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
index 5ece7b85d5..484ad159d1 100644
--- a/indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_simple_snapshot.xml
@@ -2,17 +2,17 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- can_minimize="true"
+ can_minimize="false"
  can_resize="false"
  can_close="true"
  height="305"
  layout="topleft"
- name="simple_outfit_snapshot"
- single_instance="true"
+ name="simple_snapshot"
+ single_instance="false"
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
- title="OUTFIT SNAPSHOT"
+ title="ITEM SNAPSHOT"
  width="351">
   <ui_ctrl
    layout="topleft"
@@ -36,7 +36,7 @@
    height="22"
    layout="topleft"
    left_pad="10"
-   label="Save (L$[UPLOAD_COST])"
+   label="Save"
    name="save_btn"
    width="90" />
   <button
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index f441e3cbd7..fcd24d83bb 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -440,7 +440,7 @@
     length="1"
     halign="right"
     name="360_label"
-    text_color="0.3 0.82 1 1"
+    text_color="HTMLLinkColor"
     top_delta="0"
     type="string"
     width="115">
diff --git a/indra/newview/skins/default/xui/en/floater_task_properties.xml b/indra/newview/skins/default/xui/en/floater_task_properties.xml
new file mode 100644
index 0000000000..56c236eab4
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_task_properties.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="590"
+ layout="topleft"
+ name="Task Properties"
+ help_topic="item+properties"
+ title="ITEM PROPERTIES"
+ single_instance="true"
+ width="330">
+ <panel
+   follows="all"
+   layout="topleft"
+   left="0"
+   class="sidepanel_task_info"
+   filename="sidepanel_task_info.xml"
+   name="sidepanel"
+   top="20"
+   label=""
+   height="570"
+   visible="true"
+   width="330">
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index 3a66911389..8081af6673 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -83,6 +83,22 @@
      top_pad="4">
         [DIMENSIONS]
     </text>
+    <text
+     type="string"
+     text_color="Yellow"
+     length="1"
+     word_wrap="true"
+     follows="left|top"
+     height="56"
+     width="164"
+     layout="topleft"
+     left="8"
+     name="over_limit_lbl"
+     visible="false"
+     top_delta="0">
+        Selected texture is [TEXDIM]. Inventory image must be square, no less than [MINTEXDIM].
+    </text>
+    
 <!--  middle: inventory mode -->
 
     <button
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
new file mode 100644
index 0000000000..d82c453e5f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+    layout="topleft"
+    name="Gallery">
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <menu_item_call.on_click
+         function="Inventory.Share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Empty Trash"
+     layout="topleft"
+     name="Empty Trash">
+        <menu_item_call.on_click
+         function="Inventory.EmptyTrash"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Empty Lost And Found"
+     layout="topleft"
+     name="Empty Lost And Found">
+        <menu_item_call.on_click
+         function="Inventory.EmptyLostAndFound"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Teleport"
+     layout="topleft"
+     name="Landmark Open">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Folder Wearables Separator" />
+    <menu_item_call
+     label="Replace Current Outfit"
+     layout="topleft"
+     name="Replace Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="replaceoutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add To Current Outfit"
+     layout="topleft"
+     name="Add To Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="addtooutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove From Current Outfit"
+     layout="topleft"
+     name="Remove From Outfit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="removefromoutfit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy outfit list to clipboard"
+     layout="topleft"
+     name="Copy outfit list to clipboard">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copyoutfittoclipboard" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Outfit Separator" />
+    <menu_item_call
+     label="Find Original"
+     layout="topleft"
+     name="Find Original">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="goto" />
+    </menu_item_call>
+    <menu_item_call
+     label="Purge Item"
+     layout="topleft"
+     name="Purge Item">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="purge"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Restore Item"
+     layout="topleft"
+     name="Restore Item">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="restore" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="Open">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open Original"
+     layout="topleft"
+     name="Open Original">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_original" />
+    </menu_item_call>
+    <menu_item_call
+     label="Properties"
+     layout="topleft"
+     name="Properties">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="properties" />
+    </menu_item_call>
+    <menu_item_call
+     label="Image..."
+     layout="topleft"
+     name="thumbnail">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="thumbnail" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy Asset UUID"
+     layout="topleft"
+     name="Copy Asset UUID">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copy_uuid" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Copy Separator" />
+    <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_selected_folder" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_in_new_window" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Open Folder Separator" />
+    <menu_item_call
+     label="Rename"
+     layout="topleft"
+     name="Rename">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
+     label="Cut"
+     layout="topleft"
+     name="Cut">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="cut" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy"
+     layout="topleft"
+     name="Copy">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     layout="topleft"
+     name="Paste">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste As Link"
+     layout="topleft"
+     name="Paste As Link">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="paste_link" />
+    </menu_item_call>
+    <menu_item_call
+     label="Replace Links"
+     layout="topleft"
+     name="Replace Links">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="replace_links" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Paste Separator" />
+    <menu_item_call
+     label="Delete"
+     layout="topleft"
+     name="Delete">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="delete" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete System Folder"
+     layout="topleft"
+     name="Delete System Folder">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="delete_system_folder" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Play"
+     layout="topleft"
+     name="Sound Play">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="sound_play" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Landmark Separator" />
+    <menu_item_call
+    label="Copy SLurl"
+    layout="topleft"
+    name="url_copy">
+       <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_slurl" />
+   </menu_item_call> 
+   <menu_item_call
+     label="About Landmark"
+     layout="topleft"
+     name="About Landmark">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="about" />
+    </menu_item_call>
+   <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="show_on_map">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="show_on_map" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Animation Separator" />
+    <menu_item_call
+     label="Play Inworld"
+     layout="topleft"
+     name="Animation Play">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="playworld" />
+    </menu_item_call>
+    <menu_item_call
+     label="Play Locally"
+     layout="topleft"
+     name="Animation Audition">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="playlocal" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Send Instant Message Separator" />
+    <menu_item_call
+     label="Send Instant Message"
+     layout="topleft"
+     name="Send Instant Message">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="begin_im" />
+    </menu_item_call>
+    <menu_item_call
+     label="Offer Teleport..."
+     layout="topleft"
+     name="Offer Teleport...">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="lure" />
+    </menu_item_call>
+    <menu_item_call
+     label="Request Teleport..."
+     layout="topleft"
+     name="Request Teleport...">
+        <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="request_lure" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Gesture Separator" />
+    <menu_item_call
+     label="Activate"
+     layout="topleft"
+     name="Activate">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="activate" />
+    </menu_item_call>
+    <menu_item_call
+     label="Deactivate"
+     layout="topleft"
+     name="Deactivate">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="deactivate" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Texture Separator" />
+    <menu_item_call
+     label="Save As"
+     layout="topleft"
+     name="Save As">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="save_as" />
+    </menu_item_call>
+  <menu_item_call
+ label="Save Selected As"
+ layout="topleft"
+ name="Save Selected As">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="save_selected_as" />
+  </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Wearable And Object Separator"/>
+    <menu_item_call
+     label="Wear"
+     layout="topleft"
+     name="Wearable And Object Wear">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="wear" />
+    </menu_item_call>
+    <menu
+     label="Attach To"
+     layout="topleft"
+     name="Attach To" />
+    <menu
+     label="Attach To HUD"
+     layout="topleft"
+     name="Attach To HUD" />
+    <menu_item_call
+     label="Touch"
+     layout="topleft"
+     name="Attachment Touch">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="touch" />
+    </menu_item_call>
+    <menu_item_call
+     label="Edit"
+     layout="topleft"
+     name="Wearable Edit">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="edit" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add"
+     layout="topleft"
+     name="Wearable Add">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="wear_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Detach From Yourself"
+     layout="topleft"
+     name="Detach From Yourself">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="detach" />
+    </menu_item_call>
+    <menu_item_call
+     label="Take Off"
+     layout="topleft"
+     name="Take Off">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="take_off" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" 
+     name="Settings Separator" />
+    <menu_item_call
+            name="Settings Apply Local"
+            layout="topleft"
+            label="Apply Only To Myself">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_local" />
+    </menu_item_call>
+    <menu_item_call
+            name="Settings Apply Parcel"
+            layout="topleft"
+            label="Apply To Parcel">
+        <menu_item_call.on_click 
+                function="Inventory.DoToSelected"
+                parameter="apply_settings_parcel" />
+    </menu_item_call>
+  <menu_item_separator
+   layout="topleft"
+   name="Subfolder Separator" />
+  <menu_item_call
+   label="Create folder from selected"
+   layout="topleft"
+   name="New folder from selected">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="new_folder_from_selected" />
+  </menu_item_call>
+  <menu_item_call
+   label="Ungroup folder items"
+   layout="topleft"
+   name="Ungroup folder items">
+    <menu_item_call.on_click
+     function="Inventory.DoToSelected"
+     parameter="ungroup_folder_items" />
+  </menu_item_call>
+  <menu
+   label="Use as default for"
+   layout="topleft"
+   name="upload_def">
+    <menu_item_call
+     label="Image uploads"
+     layout="topleft"
+     name="Image uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+        parameter="texture" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound uploads"
+     layout="topleft"
+     name="Sound uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="sound" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation uploads"
+     layout="topleft"
+     name="Animation uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="animation" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model uploads"
+     layout="topleft"
+     name="Model uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+       parameter="model" />
+      <menu_item_call.on_visible
+       function="Inventory.CanSetUploadLocation" />
+    </menu_item_call>
+  </menu>
+	<menu_item_separator
+	 layout="topleft"
+	 name="Marketplace Separator" />
+	<menu_item_call
+        label="Copy to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Copy">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_to_marketplace_listings" />
+	</menu_item_call>
+	<menu_item_call
+        label="Move to Marketplace Listings"
+        layout="topleft"
+        name="Marketplace Move">
+		<menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="move_to_marketplace_listings" />
+	</menu_item_call>
+	<menu_item_call
+     label="--no options--"
+     layout="topleft"
+     name="--no options--" />
+    <menu_item_separator
+     layout="topleft" />
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
index 99ca910062..0ca505dd5d 100755
--- a/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml
@@ -42,35 +42,11 @@
         parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-        label="Upload Photo (L$[UPLOAD_COST])"
-        layout="topleft"
-        name="upload_photo">
-        <on_click
-        function="Outfit.UploadPhoto" />
-    </menu_item_call>
-    <menu_item_call
-        label="Select Photo"
-        layout="topleft"
-        name="select_photo">
+     label="Image..."
+     layout="topleft"
+     name="thumbnail">
         <on_click
-        function="Outfit.SelectPhoto" />
-    </menu_item_call>
-    <menu_item_call
-        label="Take a Snapshot"
-        layout="topleft"
-        name="take_snapshot">
-        <on_click
-        function="Outfit.TakeSnapshot" />
-    </menu_item_call>
-    <menu_item_call
-        label="Remove Photo"
-        layout="topleft"
-        name="remove_photo">
-        <on_click
-        function="Outfit.RemovePhoto" />
-        <on_visible
-        function="Outfit.OnVisible"
-        parameter="remove_photo" />
+         function="Outfit.Thumbnail" />
     </menu_item_call>
     <menu_item_separator name="sepatator1" />
     <menu
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index aa3d0ae071..e650c10603 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -159,248 +159,6 @@
          function="Inventory.DoCreate"
          parameter="outfit" />
     </menu_item_call>
-    <menu_item_call
-     label="New Script"
-     layout="topleft"
-     name="New Script">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="lsl" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Notecard"
-     layout="topleft"
-     name="New Note">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="notecard" />
-    </menu_item_call>
-    <menu_item_call
-     label="New Gesture"
-     layout="topleft"
-     name="New Gesture">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="gesture" />
-    </menu_item_call>
-    <menu
-     label="New Clothes"
-     layout="topleft"
-     name="New Clothes">
-        <menu_item_call
-         label="New Shirt"
-         layout="topleft"
-         name="New Shirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Pants"
-         layout="topleft"
-         name="New Pants">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="pants" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Shoes"
-         layout="topleft"
-         name="New Shoes">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shoes" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Socks"
-         layout="topleft"
-         name="New Socks">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="socks" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Jacket"
-         layout="topleft"
-         name="New Jacket">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="jacket" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Skirt"
-         layout="topleft"
-         name="New Skirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="skirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Gloves"
-         layout="topleft"
-         name="New Gloves">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="gloves" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Undershirt"
-         layout="topleft"
-         name="New Undershirt">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="undershirt" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Underpants"
-         layout="topleft"
-         name="New Underpants">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="underpants" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Alpha Mask"
-         layout="topleft"
-         name="New Alpha Mask">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="alpha" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Tattoo"
-         layout="topleft"
-         name="New Tattoo">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="tattoo" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Universal"
-         layout="topleft"
-         name="New Universal">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         parameter="universal" />
-      </menu_item_call>
-        <menu_item_call
-         label="New Physics"
-         layout="topleft"
-         name="New Physics">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="physics" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="New Body Parts"
-     layout="topleft"
-     name="New Body Parts">
-        <menu_item_call
-         label="New Shape"
-         layout="topleft"
-         name="New Shape">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="shape" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Skin"
-         layout="topleft"
-         name="New Skin">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="skin" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Hair"
-         layout="topleft"
-         name="New Hair">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="hair" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Eyes"
-         layout="topleft"
-         name="New Eyes">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="eyes" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="New Settings"
-     layout="topleft"
-     name="New Settings">
-        <menu_item_call
-         label="New Sky"
-         layout="topleft"
-         name="New Sky">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="sky"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Water"
-         layout="topleft"
-         name="New Water">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="water"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-        <menu_item_call
-         label="New Day Cycle"
-         layout="topleft"
-         name="New Day Cycle">
-            <menu_item_call.on_click
-             function="Inventory.DoCreate"
-             parameter="daycycle"/>
-            <menu_item_call.on_enable
-                    function="Inventory.EnvironmentEnabled" />
-        </menu_item_call>
-    </menu>
-    <menu
-     label="Use as default for"
-     layout="topleft"
-     name="upload_def">
-      <menu_item_call
-       label="Image uploads"
-       layout="topleft"
-       name="Image uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="texture" />
-      </menu_item_call>
-      <menu_item_call
-       label="Sound uploads"
-       layout="topleft"
-       name="Sound uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="sound" />
-      </menu_item_call>
-      <menu_item_call
-       label="Animation uploads"
-       layout="topleft"
-       name="Animation uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="animation" />
-      </menu_item_call>
-      <menu_item_call
-       label="Model uploads"
-       layout="topleft"
-       name="Model uploads">
-        <menu_item_call.on_click
-         function="Inventory.FileUploadLocation"
-         parameter="model" />
-      </menu_item_call>
-    </menu>
     <menu
      label="Change Type"
      layout="topleft"
@@ -597,12 +355,12 @@
          parameter="properties" />
     </menu_item_call>
     <menu_item_call
-     label="Rename"
+     label="Image..."
      layout="topleft"
-     name="Rename">
+     name="thumbnail">
         <menu_item_call.on_click
          function="Inventory.DoToSelected"
-         parameter="rename" />
+         parameter="thumbnail" />
     </menu_item_call>
     <menu_item_call
      label="Copy Asset UUID"
@@ -624,6 +382,32 @@
      layout="topleft" 
      name="Copy Separator" />
     <menu_item_call
+     label="Open"
+     layout="topleft"
+     name="open_in_current_window">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="open_in_current_window" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open in new window"
+     layout="topleft"
+     name="open_in_new_window">
+        <menu_item_call.on_click
+         function="Inventory.OpenNewFolderWindow"/>
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="Open Folder Separator" />
+    <menu_item_call
+     label="Rename"
+     layout="topleft"
+     name="Rename">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="rename" />
+    </menu_item_call>
+    <menu_item_call
      label="Cut"
      layout="topleft"
      name="Cut">
@@ -931,6 +715,43 @@
      function="Inventory.DoToSelected"
      parameter="ungroup_folder_items" />
   </menu_item_call>
+  <menu
+   label="Use as default for"
+   layout="topleft"
+   name="upload_def">
+    <menu_item_call
+     label="Image uploads"
+     layout="topleft"
+     name="Image uploads">
+      <menu_item_call.on_click
+       function="Inventory.FileUploadLocation"
+        parameter="texture" />
+    </menu_item_call>
+    <menu_item_call
+     label="Sound uploads"
+     layout="topleft"
+     name="Sound uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="sound" />
+    </menu_item_call>
+    <menu_item_call
+     label="Animation uploads"
+     layout="topleft"
+     name="Animation uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="animation" />
+    </menu_item_call>
+    <menu_item_call
+     label="Model uploads"
+     layout="topleft"
+     name="Model uploads">
+    <menu_item_call.on_click
+     function="Inventory.FileUploadLocation"
+     parameter="model" />
+    </menu_item_call>
+  </menu>
 	<menu_item_separator
 	 layout="topleft"
 	 name="Marketplace Separator" />
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 3385a29a6c..12ba121d3c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -290,4 +290,13 @@
                     function="Inventory.EnvironmentEnabled" />
         </menu_item_call>
     </menu>
-</menu>
\ No newline at end of file
+    <menu_item_separator/>
+    <menu_item_call
+     label="Shop..."
+     layout="topleft"
+     name="Shop">
+        <menu_item_call.on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="shop" />
+    </menu_item_call>
+</menu>
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 3eacdbc781..2c630880c2 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
@@ -15,52 +15,25 @@
          function="Inventory.GearDefault.Custom.Action"
          parameter="new_window" />
     </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_check
-     label="Sort by Name"
-     layout="topleft"
-     name="sort_by_name">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_by_name" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort by Most Recent"
-     layout="topleft"
-     name="sort_by_recent">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_by_recent" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_by_recent" />         
-    </menu_item_check>
-    <menu_item_check
-     label="Sort Folders Always by Name"
+    <menu_item_call
+     label="Collapse All Folders"
      layout="topleft"
-     name="sort_folders_by_name">
+     name="close_folders">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_folders_by_name" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_folders_by_name" />
-    </menu_item_check>
-    <menu_item_check
-     label="Sort System Folders to Top"
+         parameter="close_folders" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
+    </menu_item_call>
+    <menu_item_call
+     label="Close All Windows"
      layout="topleft"
-     name="sort_system_folders_to_top">
+     name="close_windows">
         <on_click
          function="Inventory.GearDefault.Custom.Action"
-         parameter="sort_system_folders_to_top" />
-        <on_check
-         function="Inventory.GearDefault.Check"
-         parameter="sort_system_folders_to_top" />
-    </menu_item_check>
+         parameter="close_inv_windows" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
@@ -79,29 +52,6 @@
          function="Inventory.GearDefault.Custom.Action"
          parameter="reset_filters" />
     </menu_item_call>
-    <menu_item_call
-     label="Close All Folders"
-     layout="topleft"
-     name="close_folders">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="close_folders" />
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-    <menu_item_call
-     label="Empty Lost and Found"
-     layout="topleft"
-     name="empty_lostnfound">
-        <on_click
-         function="Inventory.GearDefault.Custom.Action"
-         parameter="empty_lostnfound" />
-        <on_enable
-         function="Inventory.GearDefault.Enable"
-         parameter="empty_lostnfound" />
-    </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
     <menu_item_call 
          label="Save Texture As"
          layout="topleft"
@@ -119,7 +69,8 @@
      name="Share"
      visible="true">
      <on_click
-         function="Inventory.Share" />
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="share" />
      <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="share" />
@@ -154,9 +105,25 @@
              function="Inventory.GearDefault.Custom.Action"
              parameter="replace_links" />
         </menu_item_call>
-    <menu_item_separator
-     layout="topleft" />
-
+    <menu_item_separator>
+        <menu_item_separator.on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
+    </menu_item_separator>
+    <menu_item_call
+     label="Empty Lost and Found"
+     layout="topleft"
+     name="empty_lostnfound">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="empty_lostnfound" />
+        <on_enable
+         function="Inventory.GearDefault.Enable"
+         parameter="empty_lostnfound" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
+    </menu_item_call>
     <menu_item_call
      label="Empty Trash"
      layout="topleft"
@@ -167,5 +134,8 @@
         <on_enable
          function="Inventory.GearDefault.Enable"
          parameter="empty_trash" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
     </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
index 46193f4a7a..8e34f52f3a 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_search_visibility.xml
@@ -7,6 +7,17 @@
  name="menu_search_visibility"
  visible="false">
   <menu_item_check
+   label="Search outfit folders"
+   layout="topleft"
+   name="search_outfits">
+    <on_click
+     function="Inventory.GearDefault.Custom.Action"
+     parameter="toggle_search_outfits" />
+    <on_check
+     function="Inventory.GearDefault.Check"
+     parameter="toggle_search_outfits" />
+  </menu_item_check>
+  <menu_item_check
    label="Search Trash"
    layout="topleft"
    name="search_trash">
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
new file mode 100644
index 0000000000..c7f9822e41
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_view_default"
+ visible="false">
+    <menu_item_check
+     label="Sort by Name"
+     layout="topleft"
+     name="sort_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_name" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort by Most Recent"
+     layout="topleft"
+     name="sort_by_recent">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_by_recent" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_by_recent" />         
+    </menu_item_check>
+    <menu_item_check
+     label="Sort Folders Always by Name"
+     layout="topleft"
+     name="sort_folders_by_name">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_folders_by_name" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_folders_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort System Folders to Top"
+     layout="topleft"
+     name="sort_system_folders_to_top">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="sort_system_folders_to_top" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="sort_system_folders_to_top" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="multi_folder_view" />
+    </menu_item_check>
+    <menu_item_separator>
+        <menu_item_separator.on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_separator>
+    <menu_item_check
+     label="List view"
+     layout="topleft"
+     name="list_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="list_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="list_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_check
+     label="Gallery view"
+     layout="topleft"
+     name="gallery_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="gallery_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="gallery_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_check
+     label="Combination view"
+     layout="topleft"
+     name="combination_view">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="combination_view" />
+        <on_check
+         function="Inventory.GearDefault.Check"
+         parameter="combination_view" />
+        <on_visible
+         function="Inventory.GearDefault.Visible"
+         parameter="single_folder_view" />
+    </menu_item_check>
+    <menu_item_separator/>
+    <menu_item_check
+     label="Inventory settings..."
+     name="inv_settings">
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="inventory_settings" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="inventory_settings" />
+    </menu_item_check>
+</toggleable_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 32d9d28434..e216962d12 100644
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -40,32 +40,11 @@
          parameter="take_off" />
     </menu_item_call>
     <menu_item_call
-     label="Upload Photo (L$[UPLOAD_COST])"
+     label="Image..."
      layout="topleft"
-     name="upload_photo">
+     name="thumbnail">
         <on_click
-         function="Gear.UploadPhoto" />
-    </menu_item_call>
-    <menu_item_call
-     label="Select Photo"
-     layout="topleft"
-     name="select_photo">
-        <on_click
-         function="Gear.SelectPhoto" />
-    </menu_item_call>
-    <menu_item_call
-     label="Take a Snapshot"
-     layout="topleft"
-     name="take_snapshot">
-        <on_click
-         function="Gear.TakeSnapshot" />
-    </menu_item_call>
-    <menu_item_call
-     label="Remove Photo"
-     layout="topleft"
-     name="remove_photo">
-        <on_click
-         function="Gear.RemovePhoto" />
+         function="Gear.Thumbnail" />
     </menu_item_call>
   <menu_item_separator name="sepatator1" />
             <!-- copied (with minor modifications) from menu_inventory_add.xml -->
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a216ef7c0d..204fead7e0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3284,6 +3284,30 @@ See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 
   <notification
    icon="alertmodal.tga"
+   label="Rename Selected Item"
+   name="RenameItem"
+   type="alertmodal">
+    Choose a new name for:
+[NAME]
+   <tag>confirm</tag>
+    <form name="form">
+    <input name="new_name" type="text" width="300">
+      [NAME]
+    </input>
+    <button
+     default="true"
+     index="0"
+     name="OK"
+     text="OK"/>
+    <button
+     index="1"
+     name="Cancel"
+     text="Cancel"/>
+   </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="RemoveFromFriends"
    type="alertmodal">
     <tag>friendship</tag>
@@ -6129,7 +6153,54 @@ Are you sure you want to delete them?
      notext="Cancel"
      yestext="OK"/>
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteThumbnail"
+   type="alertmodal">
+    <unique/>
+    Delete the image for this item? There is no undo.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Don't show me this again"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Delete"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailDimentionsLimit"
+   type="alertmodal">
+    <unique/>
+    Only square images from 64 to 256 pixels per side are allowed.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailInsufficientPermissions"
+   type="alertmodal">
+    <unique/>
+    Only copy and transfer free images can be assigned as thumbnails.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ThumbnailOutfitPhoto"
+   type="alertmodal">
+    <unique/>
+    To add an image to an outfit, use the Outfit Gallery window, or right-click on the outfit folder and select "Image..."
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
   <notification
      icon="alertmodal.tga"
      name="ConfirmUnlink"
@@ -6379,6 +6450,22 @@ Your inventory is experiencing issues. Please, contact support.
 
   <notification
    icon="alertmodal.tga"
+   name="InventoryLimitReachedAISAlert"
+   type="alertmodal">
+Your inventory is experiencing issues. Please, contact support.
+  <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="InventoryLimitReachedAIS"
+   type="notifytip">
+Your inventory is experiencing issues. Please, contact support.
+  <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="ConfirmClearBrowserCache"
    type="alertmodal">
 Are you sure you want to delete your travel, web, and search history?
@@ -11901,16 +11988,41 @@ Packing: [PACK_TIME]s [PSIZE]KB
 Unpacking: [UNPACK_TIME]s [USIZE]KB
     <tag>fail</tag>
   </notification>
-  
+
+    <notification
+     icon="alertmodal.tga"
+     label="Prompt for MFA Token"
+     name="PromptMFAToken"
+     type="alertmodal">
+        [MESSAGE]
+        <tag>confirm</tag>
+        <form name="form">
+            <input name="token" type="text" width="400" />
+            <button
+             default="true"
+             index="0"
+             name="continue"
+             text="Continue"/>
+            <button
+             index="1"
+             name="cancel"
+             text="Cancel"/>
+        </form>
+    </notification>
+
   <notification
    icon="alertmodal.tga"
    label="Prompt for MFA Token"
-   name="PromptMFAToken"
+   name="PromptMFATokenWithSave"
    type="alertmodal">
     [MESSAGE]
     <tag>confirm</tag>
     <form name="form">
       <input name="token" type="text" width="400" />
+      <ignore
+       name="ignore"
+       checkbox_only="true"
+       text="Remember this computer for 30 days."/>
       <button
        default="true"
        index="0"
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
new file mode 100644
index 0000000000..ed04e12193
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="true"
+   bg_alpha_color="InventoryBackgroundColor"
+   border="false"
+   follows="all"
+   height="390"
+   name="Inventory Gallery"
+   layout="topleft">
+  <text
+    type="string"
+    clip_partial="false"
+    follows="all"
+    layout="topleft"
+    name="empty_txt"
+    height="390"
+    halign="center"
+    valign="center"
+    parse_urls="true"
+    wrap="true">
+    Folder is empty.
+  </text> 
+  <scroll_container
+   follows="all"
+   height="390"
+   layout="topleft"
+   left="0"
+   top="0"
+   tab_stop="true"
+   name="gallery_scroll_panel"
+   opaque="false">
+  </scroll_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
new file mode 100644
index 0000000000..574872a870
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+   background_visible="false"
+   background_opaque="false"
+   bg_alpha_color="FrogGreen"
+   bg_opaque_color="FrogGreen"   
+   border="false"
+   bevel_style="none"
+   follows="left|top"
+   height="149"
+   width="130"
+   name="gallery_item_panel"
+   layout="topleft"
+   left="0"
+   top="0">
+  <thumbnail
+   name="preview_thumbnail"
+   fallback_image="Thumbnail_Fallback"
+   layout="topleft"
+   follows="left|top"
+   interactable="false"
+   height="128"
+   width="128"
+   top="0"
+   left="1"/>
+  <icon
+   left="5"
+   top_pad="-21"
+   layout="topleft"
+   name="item_type"
+   height="16"
+   width="16"
+   follows="left|top"
+   visible="true"
+   image_name="Inv_Eye"/>
+  <icon
+    left="5"
+    top_pad="-8"
+    layout="topleft"
+    name="link_overlay"
+    height="8"
+    width="6"
+    follows="left|top"
+    visible="false"
+    image_name="Inv_Link"/>
+  <panel
+   background_visible="false"
+   background_opaque="true"
+   bg_opaque_color="MenuItemHighlightBgColor"
+   border="false"
+   bevel_style="none"
+   follows="left|top"
+   left="0"
+   top="129"
+   height="25"
+   width="130"
+   name="text_bg_panel">
+    <text
+      read_only="true"
+      length="1"
+      follows="left|top"
+      left="1"
+      height="23"
+      layout="topleft"
+      name="item_name"
+      parse_urls="false"
+      text_readonly_color="White"
+      word_wrap="true"
+      top="2"
+      width="127"
+      use_ellipses="true">
+      Item name, folder name.
+    </text>
+  </panel>
+</panel>
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 2ff58035ed..f7a9c552cc 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -6,8 +6,7 @@
  layout="topleft"
  min_height="300"
  min_width="240"
- name="main inventory panel"
- width="330">
+ name="main inventory panel">
   <panel.string
    name="Itemcount">
   </panel.string>
@@ -23,211 +22,325 @@
    name="ItemcountUnknown">
     Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER]
   </panel.string>
+  <panel.string name="inventory_title">INVENTORY</panel.string>
+  <panel.string name="default_mode_btn">Multi_Folder_Mode</panel.string>
+  <panel.string name="single_folder_mode_btn">Single_Folder_Mode</panel.string>
   <text
-		     type="string"
-		     length="1"
-		     follows="left|top|right"
-		     height="13"
-		     layout="topleft"
-    		 left="12"
-		     name="ItemcountText"
-		     font="SansSerifMedium"
-		     text_color="InventoryItemLinkColor"
-		     use_ellipses="true"
-		     top_pad="0"
-		     width="300">
+     type="string"
+     length="1"
+     follows="left|top|right"
+     height="13"
+     layout="topleft"
+  	 left="12"
+  	 right="-12"
+     name="ItemcountText"
+     font="SansSerifMedium"
+     text_color="InventoryItemLinkColor"
+     use_ellipses="true"
+     top_pad="0">
     Items:
   </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left="10"
-   top="18"
-   name="search_type"
-   follows="top|left"
-   width="88">
-    <item
-     label="Name"
-     name="Name"
-     value="search_by_name"/>
-    <item
-     label="Creator"
-     name="Creator"
-     value="search_by_creator"/>
-    <item
-     label="Description"
-     name="Description"
-     value="search_by_description"/>
-    <item
-     label="UUID"
-     name="UUID"
-     value="search_by_UUID"/>
-  </combo_box>
-  <menu_button
-   follows="top|left"
-   tool_tip="Show search visibility options"
-   height="23"
-   image_overlay="Inv_Toolbar_SearchVisibility"
-   layout="topleft"
-   left_pad="3"
-   name="options_visibility_btn"
-   width="31" />
-  <filter_editor
-   text_pad_left="10"
+  <layout_stack
    follows="left|top|right"
-   height="23"
-   label="Enter search text"
-   layout="topleft"
-   left_pad="3"
-   max_length_chars="300"
-   highlight_text_field="true"
-   name="inventory search editor"
-   width="177" />
-  <tab_container
-     follows="all"
-     halign="center"
-     height="339"
-     layout="topleft"
-     left="7"
-     name="inventory filter tabs"
-     tab_height="30"
-     tab_position="top"
-     tab_min_width="100"
-     top_pad="10"
-     width="312">
-    <inventory_panel
-     bg_opaque_color="DkGray2"
-     bg_alpha_color="DkGray2"
-     background_visible="true"
-     border="false"
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="MY INVENTORY"
-     help_topic="my_inventory_tab"
-     layout="topleft"
-     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"
+   height="25"
+   animate="false"
+   top_pad="10"
+   left="2"
+   right="-4"
+   orientation="horizontal">
+    <layout_panel
      border="false"
-     bevel_style="none"
-     follows="all"
-     height="338"
-     label="RECENT"
-     help_topic="recent_inventory_tab"
-     layout="topleft"
-     left_delta="0"
-     name="Recent Items"
-     show_item_link_overlays="true"
-     width="290" />
-       <inventory_panel
-      name="Worn Items"
-      label="WORN"
-      show_empty_message="false"
-      follows="all"
+     bevel_style="in"
+     user_resize="false"
+     auto_resize="false"
+     height="25"
+     width="65"
+     name="nav_buttons"
+     visible="false">
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Back"
+      image_pressed="Single_Folder_Back"
+      image_unselected="Single_Folder_Back"
+      scale_image="false"
+      layout="topleft"
+      left="3"
+      top="2"
+      name="back_btn"
+      tool_tip="Back"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Forward"
+      image_pressed="Single_Folder_Forward"
+      image_unselected="Single_Folder_Forward"
+      scale_image="false"
+      layout="topleft"
+      left_pad="1"
+      name="forward_btn"
+      tool_tip="Forward"
+      width="20" />
+     <button
+      follows="top|left"
+      height="23"
+      image_selected="Single_Folder_Up"
+      image_pressed="Single_Folder_Up"
+      image_unselected="Single_Folder_Up"
+      scale_image="false"
       layout="topleft"
-      width="290"
-      bg_opaque_color="DkGray2"
-      bg_alpha_color="DkGray2"
-      background_visible="true"
+      left_pad="1"
+      name="up_btn"
+      tool_tip="Go up one level"
+      width="20" />
+    </layout_panel>
+    <layout_panel
       border="false"
-      bevel_style="none"
-      scroll.reserve_scroll_corner="false">
-  </inventory_panel>
-  </tab_container>
-  <layout_stack
-   animate="false"
-   border_size="0"
-   follows="left|right|bottom"
-   height="25"
-   layout="topleft"
-   orientation="horizontal"
-   top_pad="0"
-   left="10"
-   name="bottom_panel"
-   width="307">
-      <layout_panel
-       auto_resize="false"
-       height="25"
+      bevel_style="in"
+      user_resize="false"
+      height="25"
+      width="381"
+      visible="true">
+      <combo_box
+       height="23"
+       layout="topleft"
+       left="2"
+       top="0"
+       name="search_type"
+       tool_tip="Search by"
+       follows="top|left"
+       width="67">
+       <item
+        label="Name"
+        name="Name"
+        value="search_by_name"/>
+       <item
+        label="Creator"
+        name="Creator"
+        value="search_by_creator"/>
+       <item
+        label="Description"
+        name="Description"
+        value="search_by_description"/>
+       <item
+        label="UUID"
+        name="UUID"
+        value="search_by_UUID"/>
+      </combo_box>
+      <menu_button
+       follows="top|left"
+       tool_tip="Search visibility options"
+       height="23"
+       image_overlay="Inv_Toolbar_SearchVisibility"
        layout="topleft"
-       name="options_gear_btn_panel"
-       width="32">
-          <menu_button
-           follows="bottom|left"
-           tool_tip="Show additional options"
-           height="25"
-           image_hover_unselected="Toolbar_Left_Over"
-           image_overlay="OptionsMenu_Off"
-           image_selected="Toolbar_Left_Selected"
-           image_unselected="Toolbar_Left_Off"
-           layout="topleft"
-           left="0"
-           name="options_gear_btn"
-           top="0"
-           width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       height="25"
+       left_pad="1"
+       name="options_visibility_btn"
+       width="31" />
+      <filter_editor
+       text_pad_left="10"
+       follows="left|top|right"
+       height="23"
+       label="Enter search text"
        layout="topleft"
-       name="add_btn_panel"
-       width="32">
-          <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"
-           layout="topleft"
-           left="0"
-           name="add_btn"
-           tool_tip="Add new item"
-           top="0"
-           width="31" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="true"
-       height="25"
+       left_pad="1"
+       max_length_chars="300"
+       highlight_text_field="true"
+       name="inventory search editor"
+       width="150" />
+      <menu_button
+       follows="top|right"
+       tool_tip="Actions"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="OptionsMenu_Off"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
        layout="topleft"
-       name="dummy_panel"
-       width="212">
-          <icon
-           follows="bottom|left|right"
-           height="25"
-           image_name="Toolbar_Middle_Off"
-           layout="topleft"
-           left="0"
-           top="0"
-           name="dummy_icon"
-           width="211" />
-      </layout_panel>
-      <layout_panel
-       auto_resize="false"
-       height="25"
+       left_pad="1"
+       name="options_gear_btn"
+       width="31" />
+      <menu_button
+       follows="top|right"
+       tool_tip="View &amp; sort options"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="Conv_toolbar_sort"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="view_btn"
+       width="31" />
+      <button
+       follows="top|right"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="AddItem_Off"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="add_btn"
+       tool_tip="Create new item"
+       width="31" />
+      <button
+       follows="top|right"
+       tool_tip="Switch between views"
+       height="23"
+       image_hover_unselected="Toolbar_Middle_Over"
+       image_overlay="Single_Folder_Mode"
+       image_selected="Toolbar_Middle_Selected"
+       image_unselected="Toolbar_Middle_Off"
+       layout="topleft"
+       left_pad="1"
+       name="view_mode_btn"
+       width="31" />
+    </layout_panel>
+    </layout_stack>
+    <panel
+     follows="all"
+     halign="center"
+     height="372"
+     layout="topleft"
+     left="3"
+     right="-3"
+     name="default_inventory_panel"
+     top_pad="5">
+      <tab_container
+       follows="all"
+       halign="center"
+       height="372"
        layout="topleft"
-       name="trash_btn_panel"
-       width="31">
-          <dnd_button
-           follows="bottom|left"
-           height="25"
-           image_hover_unselected="Toolbar_Right_Over"
-           image_overlay="TrashItem_Off"
-           image_selected="Toolbar_Right_Selected"
-           image_unselected="Toolbar_Right_Off"
-           left="0"
-           layout="topleft"
-           name="trash_btn"
-           tool_tip="Remove selected item"
-           top="0"
-           width="31"/>
-      </layout_panel>
-  </layout_stack>
+       left="0"
+       name="inventory filter tabs"
+       tab_height="30"
+       tab_position="top"
+       tab_min_width="100"
+       top="0">
+        <inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         label="MY INVENTORY"
+         help_topic="my_inventory_tab"
+         layout="topleft"
+         name="All Items"
+         sort_order_setting="InventorySortOrder"
+         show_item_link_overlays="true"
+         preinitialize_views="false"
+         scroll.reserve_scroll_corner="false">
+            <folder double_click_override="true"/>
+        </inventory_panel>
+        <recent_inventory_panel
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         follows="all"
+         label="RECENT"
+         help_topic="recent_inventory_tab"
+         layout="topleft"
+         name="Recent Items"
+         show_item_link_overlays="true"
+         preinitialize_views="false"
+         scroll.reserve_scroll_corner="false">
+            <folder double_click_override="true"/>
+        </recent_inventory_panel>
+        <inventory_panel
+         name="Worn Items"
+         label="WORN"
+         show_empty_message="false"
+         follows="all"
+         layout="topleft"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         preinitialize_views="false"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+            <folder double_click_override="true"/>
+        </inventory_panel>
+      </tab_container>
+    </panel>
+    <panel
+     follows="all"
+     halign="center"
+     height="375"
+     layout="topleft"
+     left="7"
+     name="combination_view_inventory"
+     top_delta="0"
+     visible="false">
+     <layout_stack
+      follows="all"
+      layout="topleft"
+      height="375"
+      name="combination_view_stack"
+      animate="false"
+      drag_handle_thickness="6"
+      drag_handle_first_indent="18"
+      drag_handle_second_indent="18"
+      drag_handle_shift="5"
+      show_drag_handle="true"
+      top="0"
+      left="0"
+      orientation="vertical">
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="248"
+        min_width="150"
+        name="comb_gallery_layout">
+        <panel
+         class="inventory_gallery"
+         filename="panel_inventory_gallery.xml"
+         left="0"
+         top="1"
+         height="248"
+         name="comb_gallery_view_inv"
+         background_visible="true"
+         follows="all"
+         layout="topleft">
+        </panel>
+       </layout_panel>
+       <layout_panel
+        border="false"
+        bevel_style="in"
+        user_resize="true"
+        auto_resize="true"
+        height="127"
+        min_height="100"
+        name="comb_inventory_layout">
+        <single_folder_inventory_panel
+         name="comb_single_folder_inv"
+         follows="all"
+         left="0"
+         top="1"
+         height="127"
+         layout="topleft"
+         show_item_link_overlays="true"
+         bg_opaque_color="DkGray2"
+         bg_alpha_color="DkGray2"
+         background_visible="true"
+         border="false"
+         bevel_style="none"
+         scroll.reserve_scroll_corner="false">
+         <item
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+         <folder
+          single_folder_mode="true"
+          folder_indentation="-8"/>
+        </single_folder_inventory_panel>
+       </layout_panel>
+     </layout_stack>
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
index e3790ae09b..e951d25391 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
@@ -40,50 +40,10 @@
    layout="topleft"
    left="4"
    top="0"
+   tab_stop="true"
    name="gallery_scroll_panel"
    opaque="false"
    top_pad="0">
-   <!--outfit_gallery_item
-    layout="topleft"
-    left="10"
-    name="preview_outfit1"
-    height="175"
-    width="150"
-    follows="left|top"/-->
-     <!--layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="0" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack>
-    <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="190" name="top_gallery_stack" orientation="horizontal">
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-      <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-        <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-      </layout_panel>
-    </layout_stack>
-     <layout_stack follows="left|right" height="180" width="498" layout="topleft" left="0" animate="false" top="380" name="top_gallery_stack" orientation="horizontal">
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top_gallery_panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit1" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-       <layout_panel follows="left|top" height="175" width="166" layout="topleft" left="0" top="0" auto_resize="false" visible="true" name="top panel">
-         <outfit_gallery_item layout="topleft" left="10" name="preview_outfit2" height="175" width="150" follows="left|top"/>
-       </layout_panel>
-     </layout_stack-->
-    <!--</panel>-->  
   </scroll_container> 
   <panel
      background_visible="true"
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
index b2dc975c6e..ceaff0ea69 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
@@ -18,7 +18,7 @@
      follows="all"
      height="400"
      layout="topleft"
-     left="0"
+     left="3"
      single_expansion="true"
      top="0"
      name="wearables_accordion"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index ca1e405a62..f899f83ad4 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -19,7 +19,7 @@
      layout="topleft"
      visible="false"
     />
-    <icon
+    <thumbnail
      name="real_world_pic"
      image_name="Generic_Person_Large"
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 07cdd6d71e..fea7d1bcb8 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -68,7 +68,7 @@ Account: [ACCTTYPE]
      auto_resize="false"
      user_resize="false">
 
-      <icon
+      <thumbnail
        name="2nd_life_pic"
        image_name="Generic_Person_Large"
        layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 9995523e61..76d0ffcb8e 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -6,8 +6,7 @@
 	  layout="topleft"
 	  min_height="350"
 	  min_width="240"
-	  name="objects panel"
-	  width="333">
+	  name="objects panel">
     <panel
 		 follows="all"
 		 layout="topleft"
@@ -17,25 +16,22 @@
 		 label=""
 		 height="570"
 		 visible="true"
-		 default_tab_group="1"
-		 width="330">
+		 default_tab_group="1">
       <layout_stack
               follows="left|right|top|bottom"
               layout="topleft"
               left="0"
               top="0"
-							tab_group="1"
+              tab_group="1"
               orientation="vertical"
               name="inventory_layout_stack"
-              height="535"
-              width="330">
+              height="560">
              <layout_panel
                  name="main_inventory_layout_panel"
                  layout="topleft"
                  auto_resize="true"
                  user_resize="true"
                  min_dim="150"
-                 width="330"
                  follows="bottom|left|right"
                  height="300">
                  <panel
@@ -47,17 +43,15 @@
                       name="panel_main_inventory"
                       top="0"
                       label=""
-                      height="300"
-                      width="330" />
+                      height="300" />
              </layout_panel>
 			    <layout_panel
-                 width="330"
                  layout="topleft"
                  auto_resize="false"
                  user_resize="true"
                  follows="left|right|top"
                  name="inbox_layout_panel"
-                 visible="false"
+                 visible="true"
                  min_dim="35"
                  expanded_min_dim="90"
                  height="235">
@@ -69,17 +63,15 @@
                       class="panel_marketplace_inbox"
                       top="0"
                       label=""
-                      height="235"
-                      width="330">
+                      height="235">
                      <string name="InboxLabelWithArg">Received items ([NUM])</string>
                      <string name="InboxLabelNoArg">Received items</string>
                      <button
                         control_name="InventoryInboxToggleState"
                         label="Received items"
-												font="SansSerifMedium"
+                        font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
-                        width="308"
                         image_unselected="MarketplaceBtn_Off"
                         image_selected="MarketplaceBtn_Selected"
                         halign="left"
@@ -89,7 +81,8 @@
                         tab_stop="false"
                         pad_left="35"
                         top="0"
-                        left="10" />
+                        left="5"
+                        right="-5" />
                      <text
                         type="string"
                         length="1"
@@ -101,174 +94,35 @@
                         name="inbox_fresh_new_count"
                         font="SansSerifMedium"
                         halign="right"
-                        top_pad="0"
-                        width="300">
+                        top_pad="0">
                         [NUM] new
                      </text>
                      <panel
                         name="inbox_inventory_placeholder_panel"
                         follows="all"
-                        left="10"
-                        bottom="235"
-                        width="308"
+                        left="5"
+                        right="-5"
                         top="35"
+                        height="200"
                         bg_opaque_color="InventoryBackgroundColor"
                         background_visible="true"
                         background_opaque="true"
                         tool_tip="Drag and drop items to your inventory to use them"
                         >
                         <text name="inbox_inventory_placeholder"
-															type="string"
-															follows="all"
-															layout="topleft"
-															top="0"
-															left="0"
-															width="308"
-															height="200"
-															wrap="true"
-															halign="center">
-Purchases from the marketplace will be delivered here.
-												</text>
+                            type="string"
+                            follows="all"
+                            layout="topleft"
+                            top="0"
+                            height="200"
+                            wrap="true"
+                            halign="center"
+                            valign="center">
+                          Purchases from the marketplace will be delivered here.
+                        </text>
                     </panel>
                  </panel>
              </layout_panel>
          </layout_stack>
-			<panel follows="bottom|left|right"
-					 height="30"
-					 layout="topleft"
-					 name="button_panel"
-					 left="9"
-					 top_pad="7"
-					 width="308">
-				<layout_stack follows="bottom|left|right"
-											height="23"
-											layout="topleft"
-											mouse_opaque="false"
-											name="button_panel_ls"
-											left="0"
-											orientation="horizontal"
-											top="0"
-											width="308">	
-			    <layout_panel follows="bottom|left|right"
-												height="23"
-												layout="bottomleft"
-												left="0"			
-												mouse_opaque="false"
-												name="info_btn_lp"
-												auto_resize="true"
-												width="101">
-						<button enabled="true"
-										follows="bottom|left|right"
-										height="23"
-										label="Profile"
-										layout="topleft"
-										left="1"
-										name="info_btn"
-										tool_tip="Show object profile"
-										top="0"
-										width="100" />
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="1"			
-                     mouse_opaque="false"
-                     name="share_btn_lp"
-                     auto_resize="true"
-                     width="100">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Share"
-                         layout="topleft"
-                         left="1"
-                         name="share_btn"
-                         tool_tip="Share an inventory item"
-                         top="0"
-                         width="99" />
-			    </layout_panel>
-			    <layout_panel
-                     follows="bottom|left|right"
-                     height="23"
-                     layout="bottomleft"
-                     left_pad="1"			
-                     mouse_opaque="false"
-                     name="shop_btn_lp"
-                     auto_resize="true"
-                     width="100">
-                    <button
-                         enabled="true"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Shop"
-                         layout="topleft"
-                         left="1"
-                         name="shop_btn"
-                         tool_tip="Open Marketplace webpage"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Wear"
-                         layout="topleft"
-                         left="1"
-                         name="wear_btn"
-                         tool_tip="Wear seleceted outfit"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Play"
-                         layout="topleft"
-                         name="play_btn"
-                         left="1"
-                         top="0"
-                         width="99" />
-                    <button
-                         enabled="false"
-                         follows="bottom|left|right"
-                         height="23"
-                         label="Teleport"
-                         layout="topleft"
-                         left="1"
-                         name="teleport_btn"
-                         tool_tip="Teleport to the selected area"
-                         top="0"
-                         width="99" />
-			    </layout_panel>
-			</layout_stack>
-		</panel>
-	</panel>
-	<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_item_info"
-		 filename="sidepanel_item_info.xml"
-		 name="sidepanel__item_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
-	</panel>
-	<panel
-		 follows="all"
-		 layout="topleft"
-		 left="0"
-		 class="sidepanel_task_info"
-		 filename="sidepanel_task_info.xml"
-		 name="sidepanel__task_panel"
-		 top="0"
-		 label=""
-		 height="570"
-		 visible="false"
-		 width="330">
 	</panel>
 </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 35d14251c7..ad521cb1af 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -43,214 +43,126 @@
     name="origin_inworld">
     (Inworld)
   </panel.string>
-  <icon
-    follows="top|right"
-    height="18"
-    image_name="Lock"
-    layout="topleft"
-    right="-15"
-    mouse_opaque="true"
-    name="IconLocked"
-    top="8"
-    width="18" />
-  <button
-    follows="top|left"
-    height="24"
-    image_hover_unselected="BackButton_Over"
-    image_pressed="BackButton_Press"
-    image_unselected="BackButton_Off"
-    layout="topleft"
-    left="12"
-    name="back_btn"
-    tab_stop="false"
-    top="2"
-    width="30"
-    use_draw_context_alpha="false" />
-  <text
-    follows="top|left|right"
-    font="SansSerifHugeBold"
-    height="26"
-    layout="topleft"
-    left_pad="3"
-    name="title"
-    text_color="LtGray"
-    top="2"
-    use_ellipses="true"
-    value="Item Profile"
-    width="275" />
-  <text
-    follows="top|left|right"
-    height="13"
-    layout="topleft"
-    left="45"
-    name="origin"
-    text_color="LtGray_50"
-    use_ellipses="true"
-    value="(Inventory)"
-    width="275" />
-  <scroll_container
-    color="DkGray2"
-    follows="all"
-    layout="topleft"
-    left="9"
-    name="item_profile_scroll"
-    opaque="true"
-    height="493"
-    width="313"
-    top="45">
-    <panel
-      follows="left|top|right"
-      height="390"
-      help_topic=""
-      label=""
+
+<layout_stack
+  animate="false"
+  name="main_stack"
+  layout="topleft"
+  follows="all"
+  orientation="vertical"
+  left="0"
+  top="0"
+  right="-1"
+  bottom="-1">
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_name"
       layout="topleft"
-      left="0"
-      name="item_profile"
-      top="0"
-      width="295">
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
+      follows="all"
+      height="25">
+      <icon
+        follows="top|left"
+        height="16"
+        image_name="Inv_Object"
         layout="topleft"
         left="5"
-        name="LabelItemNameTitle"
-        top="10"
-        width="78">
-        Name:
-      </text>
+        mouse_opaque="true"
+        name="item_type_icon"
+        top="3"
+        width="16" />
       <line_editor
         border_style="line"
         border_thickness="1"
         follows="left|top|right"
-        height="20"
         layout="topleft"
-        left_delta="78"
+        left_pad="5"
+        top="1"
+        right="-5"
+        height="20"
         max_length_bytes="63"
         name="LabelItemName"
-        top_delta="0"
-        width="210"
         tool_tip="The name is limited to 63 characters. Longer prim names are cut short. Names can only consist of printable characters found in the ASCII-7 (non-extended) character set, with the exception of the vertical bar/pipe &apos;|&apos;." />
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_details"
+      layout="topleft"
+      follows="all"
+      height="133">
+      
+      <thumbnail
+        name="item_thumbnail"
+        fallback_image="Thumbnail_Fallback"
+        follows="top|left"
         layout="topleft"
         left="5"
-        name="LabelItemDescTitle"
-        top_pad="10"
-        width="78">
-        Description:
-      </text>
-      <line_editor
-        border_style="line"
-        border_thickness="1"
-        follows="left|top|right"
-        height="23"
-        layout="topleft"
-        left_delta="78"
-        max_length_bytes="127"
-        name="LabelItemDesc"
-        top_delta="-5"
-        width="210"
-        tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
+        top="2"
+        height="128"
+        width="128"
+        />
+        
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="16"
         layout="topleft"
-        left="5"
-        name="LabelCreatorTitle"
-        top_pad="10"
+        left_pad="5"
+        name="LabelOwnerTitle"
+        top="0"
         width="78">
-        Creator:
+        Owner:
       </text>
-      <avatar_icon
-        follows="top|left"
-        height="20"
-        default_icon_name="Generic_Person"
-        layout="topleft"
-        left_pad="0"
-        top_delta="-6"
-        mouse_opaque="true"
-        width="20" />
       <text
         type="string"
-        follows="left|right|top"
         font="SansSerifSmall"
-        height="15"
+        follows="left|right|top"
         layout="topleft"
-        left_pad="5"
-        name="LabelCreatorName"
-        top_delta="6"
+        height="15"
+        width="187"
+        left_delta="0"
+        top_pad="0"
+        name="LabelOwnerName"
         use_ellipses="true"
-        width="165">
+        translate="false">
+TestString PleaseIgnore
       </text>
-      <button
-        follows="top|right"
-        height="16"
-        image_selected="Inspector_I"
-        image_unselected="Inspector_I"
-        layout="topleft"
-        right="-5"
-        name="BtnCreator"
-        top_delta="-6"
-        width="16" />
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="16"
         layout="topleft"
-        left="5"
-        name="LabelOwnerTitle"
-        top_pad="10"
+        left_delta="0"
+        name="LabelCreatorTitle"
+        top_pad="7"
         width="78">
-        Owner:
+        Creator:
       </text>
-      <avatar_icon
-        follows="top|left"
-        height="20"
-        default_icon_name="Generic_Person"
-        layout="topleft"
-        left_pad="0"
-        top_delta="-6"
-        mouse_opaque="true"
-        width="20" />
       <text
         type="string"
-        follows="left|right|top"
         font="SansSerifSmall"
-        height="15"
+        follows="left|right|top"
         layout="topleft"
-        left_pad="5"
-        name="LabelOwnerName"
-        top_delta="6"
+        left_delta="0"
+        top_pad="0"
+        width="187"
+        height="15"
+        name="LabelCreatorName"
         use_ellipses="true"
-        width="165">
+        translate="false">
+TestString PleaseIgnore
       </text>
-      <button
-        follows="top|right"
-        height="16"
-        image_selected="Inspector_I"
-        image_unselected="Inspector_I"
-        layout="topleft"
-        right="-5"
-        name="BtnOwner"
-        top_delta="-3"
-        width="16" />
       <text
         type="string"
         length="1"
         follows="left|top"
-        height="23"
+        height="16"
         layout="topleft"
-        left="5"
+        left_delta="0"
         name="LabelAcquiredTitle"
-        top_pad="10"
+        top_pad="7"
         width="78">
         Acquired:
       </text>
@@ -258,171 +170,247 @@
         type="string"
         length="1"
         follows="left|top|right"
-        height="23"
+        height="18"
         layout="topleft"
-        left_delta="78"
+        left_delta="0"
         name="LabelAcquiredDate"
-        top_delta="0"
-        width="210">
+        top_pad="0"
+        width="187">
+        00/00/00
       </text>
-      <text
-        type="string"
-        length="1"
+      <button
         follows="left|top"
-        height="10"
+        height="21"
+        label="Image..."
         layout="topleft"
-        left="5"
-        name="LabelItemExperienceTitle"
+        left_delta="0"
+        name="change_thumbnail_btn"
         top_pad="0"
-        width="78"
-        visible="true">
-        Experience:
-      </text>
+        width="120" />
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_description"
+      layout="topleft"
+      follows="all"
+      height="84">
       <text
         type="string"
         length="1"
-        follows="left|top|right"
+        follows="left|top"
         height="10"
         layout="topleft"
-        left_delta="78"
-        name="LabelItemExperience"
-        top_delta="0"
-        width="210"
-        visible="true"
-        />
-      <panel
-        border="false"
-        follows="left|top|right"
+        left="5"
+        name="LabelItemDescTitle"
+        top="0"
+        width="78">
+        Description:
+      </text>
+      <text_editor
+        text_type="ascii_printable_no_pipe"
+        commit_on_focus_lost="true"
+        border_style="line"
+        border_thickness="1"
+        word_wrap="true"
+        use_ellipses="false"
+        follows="all"
         layout="topleft"
-        mouse_opaque="false"
-        name="perms_inv"
-        left="0"
-        top_pad="25"
-        height="155"
-        width="313">
-        <text
-          type="string"
-          length="1"
-          left="10"
-          top_pad="13"
-          text_color="EmphasisColor"
-          height="15"
-          follows="left|top|right"
-          layout="topleft"
-          name="perm_modify"
-          width="200">
-          You can:
-        </text>
-        <check_box
-          height="18"
-          label="Modify"
-          layout="topleft"
-          left="20"
-          name="CheckOwnerModify"
-          top_pad="0"
-          width="90" />
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckOwnerCopy"
-          width="90" />
-        <check_box
-          height="18"
-          label="Transfer"
-          layout="topleft"
-          left_pad="0"
-          name="CheckOwnerTransfer"
-          width="106" />
-        <text
-          type="string"
-          length="1"
-          follows="left|top"
-          height="16"
-          layout="topleft"
-          left="10"
-          name="AnyoneLabel"
-          top_pad="8"
-          width="100">
-          Anyone:
-        </text>
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckEveryoneCopy"
-          tool_tip="Anyone can take a copy of the object . Object and all of its contents must be copy and transfer permissive."
-          top_delta="-2"
-          width="150" />
+        left="5"
+        top_pad="5"
+        right="-5"
+        height="46"
+        max_length="127"
+        name="LabelItemDesc"
+        tool_tip="When people have &apos;Hover Tips on All Objects&apos; selected in the viewer's settings, they'll see the object description pop-up for any object under their mouse pointer. The prim description is limited to 127 bytes any string longer then that will be truncated." />
+
         <text
           type="string"
           length="1"
           follows="left|top"
-          height="16"
+          height="10"
           layout="topleft"
-          left="10"
-          name="GroupLabel"
-          top_pad="8"
-          width="100">
-          Group:
+          left="5"
+          name="LabelItemExperienceTitle"
+          top_pad="7"
+          width="78"
+          visible="true">
+          Experience:
         </text>
-        <check_box
-          height="18"
-          label="Share"
-          layout="topleft"
-          left_pad="0"
-          top_delta="-2"
-          name="CheckShareWithGroup"
-          tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-          width="150" />
         <text
           type="string"
           length="1"
-          follows="left|top"
-          height="16"
-          layout="topleft"
-          left="10"
-          name="NextOwnerLabel"
-          top_pad="8"
-          width="200"
-          word_wrap="true">
-          Next owner:
-        </text>
-        <check_box
-          height="18"
-          label="Modify"
-          layout="topleft"
-          left="20"
-          top_pad="0"
-          name="CheckNextOwnerModify"
-          tool_tip="Next owner can edit properties like item name or scale of this object."
-          width="90" />
-        <check_box
-          height="18"
-          label="Copy"
-          layout="topleft"
-          left_pad="0"
-          name="CheckNextOwnerCopy"
-          tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
-          width="90" />
-        <check_box
-          height="18"
-          label="Transfer"
+          follows="left|top|right"
+          height="10"
           layout="topleft"
-          left_pad="0"
-          name="CheckNextOwnerTransfer"
-          tool_tip="Next owner can give away or resell this object."
-          width="106" />
-      </panel>
+          left_delta="78"
+          name="LabelItemExperience"
+          top_delta="0"
+          width="210"
+          visible="true"
+          />
+    </layout_panel>
+    
+    <layout_panel
+      auto_resize="false"
+      name="layout_item_permissions_sale"
+      layout="topleft"
+      follows="all"
+      height="235">
+      
+      <view_border
+        bevel_style="none"
+        height="0"
+        layout="topleft"
+        left="5"
+        right="-5"
+        name="cost_text_border"
+        top="1"/>
+        
+      <text
+        type="string"
+        length="1"
+        left="10"
+        top_pad="7"
+        height="15"
+        follows="left|top"
+        layout="topleft"
+        name="perm_modify"
+        width="200">
+        Permissions
+      </text>
+
+      <text
+        type="string"
+        length="1"
+        left="10"
+        top_pad="5"
+        height="15"
+        follows="left|top"
+        layout="topleft"
+        name="perm_modify"
+        width="200">
+        You can:
+      </text>
+      <check_box
+        height="18"
+        label="Modify"
+        layout="topleft"
+        left="20"
+        name="CheckOwnerModify"
+        top_pad="0"
+        width="90" />
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckOwnerCopy"
+        width="90" />
+      <check_box
+        height="18"
+        label="Transfer"
+        layout="topleft"
+        left_pad="0"
+        name="CheckOwnerTransfer"
+        width="106" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="AnyoneLabel"
+        top_pad="8"
+        width="100">
+        Anyone:
+      </text>
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckEveryoneCopy"
+        tool_tip="Anyone can take a copy of the object . Object and all of its contents must be copy and transfer permissive."
+        top_delta="-2"
+        width="150" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="GroupLabel"
+        top_pad="8"
+        width="100">
+        Group:
+      </text>
+      <check_box
+        height="18"
+        label="Share"
+        layout="topleft"
+        left_pad="0"
+        top_delta="-2"
+        name="CheckShareWithGroup"
+        tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+        width="150" />
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="16"
+        layout="topleft"
+        left="10"
+        name="NextOwnerLabel"
+        top_pad="8"
+        width="200"
+        word_wrap="true">
+        Next owner:
+      </text>
+      <check_box
+        height="18"
+        label="Modify"
+        layout="topleft"
+        left="20"
+        top_pad="0"
+        name="CheckNextOwnerModify"
+        tool_tip="Next owner can edit properties like item name or scale of this object."
+        width="90" />
+      <check_box
+        height="18"
+        label="Copy"
+        layout="topleft"
+        left_pad="0"
+        name="CheckNextOwnerCopy"
+        tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied."
+        width="90" />
+      <check_box
+        height="18"
+        label="Transfer"
+        layout="topleft"
+        left_pad="0"
+        name="CheckNextOwnerTransfer"
+        tool_tip="Next owner can give away or resell this object."
+        width="106" />
+        
+    <view_border
+        bevel_style="none"
+        height="0"
+        layout="topleft"
+        left="5"
+        right="-5"
+        name="cost_text_border"
+        top_pad="9"/>
+        
       <check_box
         height="18"
         label="For Sale"
         layout="topleft"
         left="20"
         name="CheckPurchase"
-        top_pad="20"
+        top_pad="15"
         width="100"
         tool_tip="Lets people buy this object, its content or it copy inworld for specified price." />
       <combo_box
@@ -450,6 +438,7 @@
         follows="left|top"
         decimal_digits="0"
         increment="1"
+        control_name="Edit Cost"
         name="Edit Cost"
         label="Price: L$"
         label_width="75"
@@ -460,88 +449,80 @@
         max_val="999999999"
         top_pad="10"
         tool_tip="Object cost." />
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left="10"
-        name="BaseMaskDebug"
-        text_color="White"
-        top_pad="30"
-        width="130">
-        B:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="OwnerMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="270">
-        O:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="GroupMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="210">
-        G:
-      </text>
-      <text
-        type="string"
-        length="1"
-        follows="left|top"
-        height="10"
-        layout="topleft"
-        left_delta="60"
-        name="EveryoneMaskDebug"
-        text_color="White"
-        top_delta="0"
-        width="150">
-        E:
-      </text>
-      <text
-       type="string"
-       length="1"
-       follows="left|top"
-       height="10"
-       layout="topleft"
-       left_delta="60"
-       name="NextMaskDebug"
-       text_color="White"
-       top_delta="0"
-       width="90">
-        N:
-      </text>
-    </panel>   
-  </scroll_container>
-  <panel
-    height="30"
-    layout="topleft"
-    name="button_panel"
-    left="5"
-    top_pad="0"
-    width="313"
-    follows="top|right|left">
-    <button
-      follows="top|right"
-      height="23"
-      label="Cancel"
-      layout="topleft"
-      name="cancel_btn"
-      right="-1"
-      width="100" />
-  </panel>
+      
+    </layout_panel>
+
+    <layout_panel
+     auto_resize="false"
+     name="layout_debug_permissions"
+     layout="topleft"
+     follows="all"
+     height="30">
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left="10"
+          name="BaseMaskDebug"
+          text_color="White"
+          top="2"
+          width="130">
+          B:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="OwnerMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="270">
+          O:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="GroupMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="210">
+          G:
+        </text>
+        <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="10"
+          layout="topleft"
+          left_delta="60"
+          name="EveryoneMaskDebug"
+          text_color="White"
+          top_delta="0"
+          width="150">
+          E:
+        </text>
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="10"
+         layout="topleft"
+         left_delta="60"
+         name="NextMaskDebug"
+         text_color="White"
+         top_delta="0"
+         width="90">
+          N:
+        </text>
+    </layout_panel>
+  </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 5f0241512a..faff6185ab 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -62,25 +62,12 @@
              name="Sale Mixed">
                 Mixed Sale
             </panel.string>
-    <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     left="8"
-     name="back_btn"
-     tab_stop="false"
-     top="0"
-     width="30"
-     use_draw_context_alpha="false" />
-        <text
+    <text
      follows="top|left|right"
      font="SansSerifHuge"
      height="26"
      layout="topleft"
-     left_pad="10"
+     left="48"
      name="title"
      text_color="LtGray"
      top="0"
@@ -181,7 +168,6 @@
 		     translate="false"
          use_ellipses="true" 
 		     width="225">
-	        TestString PleaseIgnore
 	     </text>
 	    <text
 			 type="string"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 01f1e4efe9..844af62905 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2306,6 +2306,8 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="FavoritesNoMatchingItems">To add a place to your favorites, click the star to the right of the location name, then save the landmark to "Favorites bar".</string>
 	<string name="MarketplaceNoListing">You have no listings yet.</string>
 	<string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string>
+	<string name="InventorySingleFolderEmpty">Folder is empty.</string>
+	<string name="InventorySingleFolderNoMatches">No matches.</string>
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
 	<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
@@ -2353,6 +2355,7 @@ If you continue to receive this message, please contact Second Life support for
 	<string name="InventoryMarketplaceListingsNoItems">
         Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
 	</string>
+    <string name="InventoryFolderDebug">( F:[FOLDER_COUNT] I:[ITEMS_COUNT] V:[VERSION] DC:[VIEWER_DESCENDANT_COUNT]/[SERVER_DESCENDANT_COUNT] )</string>
 	<string name="InventoryItemsCount">( [ITEMS_COUNT] Items )</string>
 	<string name="Marketplace Validation Log"></string>
 	<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
@@ -2391,12 +2394,16 @@ If you continue to receive this message, please contact Second Life support for
   <string name="Unconstrained">Unconstrained</string>
 
 	<!-- use value="" because they have preceding spaces -->
+    <string name="active" value=" (active)"/>
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />
 	<string name="no_copy"     value=" (no copy)" />
 	<string name="worn"        value=" (worn)" />
-	<string name="link"        value=" (link)" />
-	<string name="broken_link" value=" (broken_link)" />
+	<string name="link"        value="  link" />
+	<string name="broken_link" value="  broken_link" />
+    <string name="no_transfer_lbl" value=" no transfer" />
+    <string name="no_modify_lbl"   value=" no modify" />
+    <string name="no_copy_lbl"     value=" no copy" />
 	<string name="LoadingContents">Loading contents...</string>
 	<string name="NoContents">No contents</string>
 	<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
deleted file mode 100644
index a8a3ad08f8..0000000000
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPIEDADES DEL ÍTEM DEL INVENTARIO">
-	<floater.string name="unknown">(desconocido)</floater.string>
-	<floater.string name="public">(público)</floater.string>
-	<floater.string name="you_can">Usted puede:</floater.string>
-	<floater.string name="owner_can">El propietario puede:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local][day,datetime,local] [mth,datetime,local] [year,datetime,local][hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nombre:</text>
-	<text name="LabelItemDescTitle">Descripción:</text>
-	<text name="LabelCreatorTitle">Creador:</text>
-	<button label="Perfil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Propietario:</text>
-	<button label="Perfil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Adquirido:</text>
-	<text name="LabelAcquiredDate">May Mié 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Tú:</text>
-	<check_box label="Editar" name="CheckOwnerModify"/>
-	<check_box label="Copiarlo" left_delta="88" name="CheckOwnerCopy"/>
-	<check_box label="Revender" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Cualquiera:</text>
-	<check_box label="Copiar" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grupo:</text>
-	<check_box label="Compartir" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Próximo propietario:</text>
-	<check_box label="Editar" name="CheckNextOwnerModify"/>
-	<check_box label="Copiarlo" left_delta="88" name="CheckNextOwnerCopy"/>
-	<check_box label="Revender" name="CheckNextOwnerTransfer"/>
-	<check_box label="En venta" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copiar" name="Copy"/>
-		<combo_box.item label="Contenidos" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Precio:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
index 1252c7ce0d..bf1205046b 100644
--- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT] Objetos y [CATEGORY_COUNT] Carpetas Obtenidos [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTARIO</panel.string>
 	<text name="ItemcountText">
 		Ítems:
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
deleted file mode 100644
index 1d4e7c818f..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPRIÉTÉS DES ARTICLES DE L&apos;INVENTAIRE">
-	<floater.string name="unknown">(inconnu)</floater.string>
-	<floater.string name="public">(public)</floater.string>
-	<floater.string name="you_can">Vous pouvez :</floater.string>
-	<floater.string name="owner_can">Le propriétaire peut :</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nom :</text>
-	<text name="LabelItemDescTitle">Description :</text>
-	<text name="LabelCreatorTitle">Créateur :</text>
-	<button label="Profil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Propriétaire :</text>
-	<button label="Profil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Acquis :</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Vous :</text>
-	<check_box label="Modifier" name="CheckOwnerModify"/>
-	<check_box label="Copier" name="CheckOwnerCopy"/>
-	<check_box label="Revendre" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel" width="80">N&apos;importe qui :</text>
-	<check_box label="Copier" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel" width="80">Groupe :</text>
-	<check_box label="Partager" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="192">Le prochain propriétaire :</text>
-	<check_box label="Modifier" name="CheckNextOwnerModify"/>
-	<check_box label="Copier" name="CheckNextOwnerCopy"/>
-	<check_box label="Revendre" name="CheckNextOwnerTransfer"/>
-	<check_box label="À vendre" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copier" name="Copy"/>
-		<combo_box.item label="Contenu" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Prix :" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
index 5bcee89752..5bf4d6c15d 100644
--- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Recherche effectuée [ITEM_COUNT] d&apos;articles et [CATEGORY_COUNT] de dossiers [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTAIRE</panel.string>
 	<text name="ItemcountText">
 		Articles :
 	</text>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
deleted file mode 100644
index 8cf680b3f0..0000000000
--- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="CARATTERISTICHE DELL&apos;ARTICOLO IN INVENTARIO">
-	<floater.string name="unknown">(sconosciuto)</floater.string>
-	<floater.string name="public">(pubblico)</floater.string>
-	<floater.string name="you_can">Tu puoi:</floater.string>
-	<floater.string name="owner_can">Il proprietario può:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nome:</text>
-	<text name="LabelItemDescTitle">Descrizione:</text>
-	<text name="LabelCreatorTitle">Creatore:</text>
-	<button label="Profilo..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">proprietario:</text>
-	<button label="Profilo..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Acquisito:</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Tu:</text>
-	<check_box label="Modifica" name="CheckOwnerModify"/>
-	<check_box label="Copiare" left_delta="88" name="CheckOwnerCopy"/>
-	<check_box label="Rivendi" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Chiunque:</text>
-	<check_box label="Copia" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Gruppo:</text>
-	<check_box label="Condividi" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Proprietario successivo:</text>
-	<check_box label="Modifica" name="CheckNextOwnerModify"/>
-	<check_box label="Copiare" left_delta="88" name="CheckNextOwnerCopy"/>
-	<check_box label="Rivendi" name="CheckNextOwnerTransfer"/>
-	<check_box label="In vendita" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Copia" name="Copy"/>
-		<combo_box.item label="Contenuti" name="Contents"/>
-		<combo_box.item label="Originale" name="Original"/>
-	</combo_box>
-	<spinner label="Prezzo:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
index 5d11967cee..d6890229e7 100644
--- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Recuperati [ITEM_COUNT] oggetti e [CATEGORY_COUNT] cartelle [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTARIO</panel.string>
 	<text name="ItemcountText">
 		Oggetti:
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
deleted file mode 100644
index 2a8c9f83b2..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="インベントリアイテムのプロパティ">
-	<floater.string name="unknown">
-		（不明）
-	</floater.string>
-	<floater.string name="public">
-		（公共）
-	</floater.string>
-	<floater.string name="you_can">
-		できること：
-	</floater.string>
-	<floater.string name="owner_can">
-		オーナーは次のことができます：
-	</floater.string>
-	<floater.string name="acquiredDate">
-		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
-	</floater.string>
-	<text name="LabelItemNameTitle">
-		名前：
-	</text>
-	<text name="LabelItemDescTitle">
-		説明：
-	</text>
-	<text name="LabelCreatorTitle">
-		制作者：
-	</text>
-	<button label="プロフィール…" label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">
-		所有者：
-	</text>
-	<button label="プロフィール…" label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">
-		入手日時：
-	</text>
-	<text name="LabelAcquiredDate">
-		2006年5月24日水曜日　12：50：46
-	</text>
-	<text name="OwnerLabel">
-		あなた：
-	</text>
-	<check_box label="編集" name="CheckOwnerModify"/>
-	<check_box label="コピー" name="CheckOwnerCopy"/>
-	<check_box label="再販・譲渡" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">
-		全員：
-	</text>
-	<check_box label="コピー" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">
-		グループ：
-	</text>
-	<check_box label="共有" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">
-		次の所有者：
-	</text>
-	<check_box label="編集" name="CheckNextOwnerModify"/>
-	<check_box label="コピー" name="CheckNextOwnerCopy"/>
-	<check_box label="再販・譲渡" name="CheckNextOwnerTransfer"/>
-	<check_box label="売り出し中" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="コピー" name="Copy"/>
-		<combo_box.item label="コンテンツ" name="Contents"/>
-		<combo_box.item label="オリジナル" name="Original"/>
-	</combo_box>
-	<spinner label="価格：" name="Edit Cost"/>
-	<text name="CurrencySymbol">
-		L$
-	</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index 9d78beb9da..a38492c6d1 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT]個のアイテムと[CATEGORY_COUNT]個のフォルダーを取得しました。[FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">インベントリ</panel.string>
 	<text name="ItemcountText">
 		アイテム：
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
deleted file mode 100644
index d2844e117f..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties" title="WŁAŚCIWOŚCI OBIEKTÓW W SZAFIE">
-	<floater.string name="unknown">
-		(nieznany)
-	</floater.string>
-	<floater.string name="public">
-		(publiczny)
-	</floater.string>
-	<floater.string name="you_can">
-		Ty możesz:
-	</floater.string>
-	<floater.string name="owner_can">
-		Właściciel może:
-	</floater.string>
-	<text name="LabelItemNameTitle">
-		Nazwa:
-	</text>
-	<text name="LabelItemDescTitle">
-		Opis:
-	</text>
-	<text name="LabelCreatorTitle">
-		Twórca:
-	</text>
-	<button label="Profil..." name="BtnCreator" />
-	<text name="LabelOwnerTitle">
-		Właściciel:
-	</text>
-	<button label="Profil..." name="BtnOwner" />
-	<text name="LabelAcquiredTitle">
-		Nabyte:
-	</text>
-	<text name="OwnerLabel">
-		Ty:
-	</text>
-	<check_box label="Modyfikacja" name="CheckOwnerModify" />
-	<check_box label="Kopiowanie" name="CheckOwnerCopy" />
-	<check_box label="Transferowanie" name="CheckOwnerTransfer" />
-	<text name="AnyoneLabel">
-		Każdy:
-	</text>
-	<check_box label="Kopiowanie" name="CheckEveryoneCopy" />
-	<text name="GroupLabel">
-		Grupa:
-	</text>
-	<check_box label="Udostępnij" name="CheckShareWithGroup" />
-	<text name="NextOwnerLabel">
-		Nast. właściciel:
-	</text>
-	<check_box label="Modyfikacja" name="CheckNextOwnerModify" />
-	<check_box label="Kopiowanie" name="CheckNextOwnerCopy" />
-	<check_box label="Transferowanie" name="CheckNextOwnerTransfer" />
-	<check_box label="Sprzedaż" name="CheckPurchase" />
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopia" name="Copy" />
-		<combo_box.item label="Zawartość" name="Contents" />
-		<combo_box.item label="Oryginał" name="Original" />
-	</combo_box>
-	<spinner name="Edit Cost" label="Cena:" />
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
index dc254e246f..1011c38378 100644
--- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
@@ -6,6 +6,7 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] obiekty [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">MOJA SZAFA</panel.string>
 	<text name="ItemcountText">
 		Obiekty:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
deleted file mode 100644
index 5f04c08531..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="PROPRIEDADES DE ITEM NO INVENTÁRIO">
-	<floater.string name="unknown">(desconhecido)</floater.string>
-	<floater.string name="public">(público)</floater.string>
-	<floater.string name="you_can">Você pode:</floater.string>
-	<floater.string name="owner_can">Proprietário pode :</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Nome:</text>
-	<text name="LabelItemDescTitle">Descrição:</text>
-	<text name="LabelCreatorTitle">Criador:</text>
-	<button label="Perfil..." label_selected="" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Dono:</text>
-	<button label="Perfil..." label_selected="" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Adquirido:</text>
-	<text name="LabelAcquiredDate">Qua Mai 24 12:50:46 2006</text>
-	<text name="OwnerLabel">Você:</text>
-	<check_box label="Editar" name="CheckOwnerModify"/>
-	<check_box label="Copiar" name="CheckOwnerCopy"/>
-	<check_box label="Revender" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Todos:</text>
-	<check_box label="Cortar" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grupo:</text>
-	<check_box label="Compartilhar" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel" width="230">Próximo proprietário:</text>
-	<check_box label="Editar" name="CheckNextOwnerModify"/>
-	<check_box label="Copiar" name="CheckNextOwnerCopy"/>
-	<check_box label="Revender" name="CheckNextOwnerTransfer"/>
-	<check_box label="À venda" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Cortar" name="Copy"/>
-		<combo_box.item label="Conteúdo" name="Contents"/>
-		<combo_box.item label="Original" name="Original"/>
-	</combo_box>
-	<spinner label="Preço:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
index 009b5b3193..e0cf528468 100644
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Itens [ITEM_COUNT] e Pastas [CATEGORY_COUNT] Reunidos [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">INVENTÁRIO</panel.string>
 	<text name="ItemcountText">
 		Itens:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
deleted file mode 100644
index c988825756..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="СВОЙСТВА ПРЕДМЕТА">
-	<floater.string name="unknown">(неизвестно)</floater.string>
-	<floater.string name="public">(публичное)</floater.string>
-	<floater.string name="you_can">Вы можете:</floater.string>
-	<floater.string name="owner_can">Владелец может:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local], [day,datetime,local] [mth,datetime,local] [year,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Название:</text>
-	<text name="LabelItemDescTitle">Описание:</text>
-	<text name="LabelCreatorTitle">Создатель:</text>
-	<button label="Профиль…" name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Владелец:</text>
-	<button label="Профиль…" name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Приобретено:</text>
-	<text name="LabelAcquiredDate">Ср 24 Май 12:50:46 2006</text>
-	<text name="OwnerLabel">Вы:</text>
-	<check_box label="Изменить" name="CheckOwnerModify"/>
-	<check_box label="Копировать" name="CheckOwnerCopy"/>
-	<check_box label="Перепродать" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Все:</text>
-	<check_box label="Копировать" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Группа:</text>
-	<check_box label="Поделиться" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">Следующий владелец:</text>
-	<check_box label="Изменить" name="CheckNextOwnerModify"/>
-	<check_box label="Копировать" name="CheckNextOwnerCopy"/>
-	<check_box label="Перепродать" name="CheckNextOwnerTransfer"/>
-	<check_box label="Для продажи" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Копировать" name="Copy"/>
-		<combo_box.item label="Содержимое" name="Contents"/>
-		<combo_box.item label="Оригинал" name="Original"/>
-	</combo_box>
-	<spinner label="Цена:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
index f2502bf6d3..b473fb8f98 100644
--- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		Выборка [ITEM_COUNT] предметов и [CATEGORY_COUNT] папок [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">ИНВЕНТАРЬ</panel.string>
 	<text name="ItemcountText">
 		Вещи:
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
deleted file mode 100644
index c6a5515c6e..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="ENVANTER ÖGESİ ÖZELLİKLERİ">
-	<floater.string name="unknown">(bilinmiyor)</floater.string>
-	<floater.string name="public">(kamuya açık)</floater.string>
-	<floater.string name="you_can">Şunu yapabilirsiniz:</floater.string>
-	<floater.string name="owner_can">Sahip şunu yapabilir:</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">Ad:</text>
-	<text name="LabelItemDescTitle">Açıklama:</text>
-	<text name="LabelCreatorTitle">Oluşturan:</text>
-	<button label="Profil..." name="BtnCreator"/>
-	<text name="LabelOwnerTitle">Sahip:</text>
-	<button label="Profil..." name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">Alınan:</text>
-	<text name="LabelAcquiredDate">24 Mayıs Çarş 12:50:46 2006</text>
-	<text name="OwnerLabel">Siz:</text>
-	<check_box label="Düzenle" name="CheckOwnerModify"/>
-	<check_box label="Kopyala" name="CheckOwnerCopy"/>
-	<check_box label="Tekrar Sat" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">Herkes:</text>
-	<check_box label="Kopyala" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">Grup:</text>
-	<check_box label="Paylaş" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">Sonraki sahip:</text>
-	<check_box label="Düzenle" name="CheckNextOwnerModify"/>
-	<check_box label="Kopyala" name="CheckNextOwnerCopy"/>
-	<check_box label="Tekrar Sat" name="CheckNextOwnerTransfer"/>
-	<check_box label="Satılık" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="Kopyala" name="Copy"/>
-		<combo_box.item label="İçerik" name="Contents"/>
-		<combo_box.item label="Orijinal" name="Original"/>
-	</combo_box>
-	<spinner label="Fiyat:" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
index a11fd98b9a..7e98078635 100644
--- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		[ITEM_COUNT] Öğe ve [CATEGORY_COUNT] Klasör Alındı [FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">ENVANTER</panel.string>
 	<text name="ItemcountText">
 		Ögeler:
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
deleted file mode 100644
index 4f17b96579..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="收納區物品屬性">
-	<floater.string name="unknown">（未知）</floater.string>
-	<floater.string name="public">（公開）</floater.string>
-	<floater.string name="you_can">你可以：</floater.string>
-	<floater.string name="owner_can">所有人可以：</floater.string>
-	<floater.string name="acquiredDate">[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]</floater.string>
-	<text name="LabelItemNameTitle">名稱：</text>
-	<text name="LabelItemDescTitle">描述：</text>
-	<text name="LabelCreatorTitle">創造者：</text>
-	<button label="檔案..." name="BtnCreator"/>
-	<text name="LabelOwnerTitle">所有人：</text>
-	<button label="檔案..." name="BtnOwner"/>
-	<text name="LabelAcquiredTitle">取得於：</text>
-	<text name="LabelAcquiredDate">Wed May 24 12:50:46 2006</text>
-	<text name="OwnerLabel">你：</text>
-	<check_box label="編輯" name="CheckOwnerModify"/>
-	<check_box label="恚庨" name="CheckOwnerCopy"/>
-	<check_box label="轉售" name="CheckOwnerTransfer"/>
-	<text name="AnyoneLabel">任何人：</text>
-	<check_box label="恚庨" name="CheckEveryoneCopy"/>
-	<text name="GroupLabel">群組：</text>
-	<check_box label="分享" name="CheckShareWithGroup"/>
-	<text name="NextOwnerLabel">下一個所有人：</text>
-	<check_box label="編輯" name="CheckNextOwnerModify"/>
-	<check_box label="恚庨" name="CheckNextOwnerCopy"/>
-	<check_box label="轉售" name="CheckNextOwnerTransfer"/>
-	<check_box label="出售" name="CheckPurchase"/>
-	<combo_box name="ComboBoxSaleType">
-		<combo_box.item label="複製" name="Copy"/>
-		<combo_box.item label="內容" name="Contents"/>
-		<combo_box.item label="原件" name="Original"/>
-	</combo_box>
-	<spinner label="價格：" name="Edit Cost"/>
-	<text name="CurrencySymbol">L$</text>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index 1a28f4c3b5..9ffa9323cc 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -9,6 +9,7 @@
 	<panel.string name="ItemcountUnknown">
 		擷取了[ITEM_COUNT]個物項及[CATEGORY_COUNT]個資料夾[FILTER]
 	</panel.string>
+    <panel.string name="inventory_title">收納區</panel.string>
 	<text name="ItemcountText">
 		物品：
 	</text>