svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification

This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.

5 files changed, 88 insertions, 1 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index 37c6cbf391..610c62a21a 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -207,6 +207,22 @@
                  parameter="category" />
             </menu_item_call>
             <menu_item_call
+             label="New Outfit"
+             layout="topleft"
+             name="New Outfit">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="outfit" />
+            </menu_item_call>
+            <menu_item_call
+             label="New My Outfits"
+             layout="topleft"
+             name="New My Outfits">
+                <menu_item_call.on_click
+                 function="Inventory.DoCreate"
+                 parameter="my_otfts" />
+            </menu_item_call>
+            <menu_item_call
              label="New Script"
              layout="topleft"
              name="New Script">
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index c788f8f095..dd8acea4ed 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -85,6 +85,22 @@
          parameter="current" />
     </menu_item_call>
     <menu_item_call
+       label="New Outfit"
+       layout="topleft"
+       name="New Outfit">
+      <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="outfit" />
+    </menu_item_call>
+    <menu_item_call
+       label="New My Outfits"
+       layout="topleft"
+       name="New My Outfits">
+      <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="my_otfts" />
+    </menu_item_call>
+    <menu_item_call
      label="New Script"
      layout="topleft"
      name="New Script">
@@ -322,6 +338,14 @@
              function="Inventory.DoToSelected"
              parameter="change_folder_type_undershirt" />
         </menu_item_call>
+        <menu_item_call
+         label="Outfit"
+         layout="topleft"
+         name="Outfit">
+            <menu_item_call.on_click
+             function="Inventory.DoToSelected"
+             parameter="change_folder_type_outfit" />
+        </menu_item_call>
     </menu>
     <menu_item_call
      label="Teleport"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index a7b66d8555..58be74a598 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -74,7 +74,7 @@
         class="panel_places" 
         name="panel_places" 
         filename="panel_places.xml" 
-        label="Places" 
+        label="Places"
         border="true"
       />
   </sidetray_tab>
@@ -586,5 +586,25 @@
     
   </sidetray_tab>
  --> 
+
+  <sidetray_tab
+    name="sidebar_appearance"
+    tab_title="Appearance"
+    description="Change your looks and appearance."
+    image="TabIcon_Appearance_Off"
+    mouse_opaque="false" 
+    background_opaque="false" 
+    background_visible="true" 
+    bg_opaque_color="0.5 0.5 0.5 1.0"
+  >
+      <panel 
+        class="panel_appearance"
+        name="panel_appearance" 
+        filename="panel_appearance.xml" 
+        border="true" 
+      />
+  </sidetray_tab>
+
+
 </side_tray>
 
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index a85662603d..f10161cecd 100644
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
@@ -85,6 +85,31 @@
       				mouse_opaque="false" name="tab_description" >    
 					Change your profile, your look and quick links to your outfits.
   				</text>
+		</panel>
+		<panel 
+			left="10" width="280" height="130" 
+			background_visible="true" 
+			background_opaque="false" 
+			bg_alpha_color="0.3 0.3 0.3 1.0" 
+			name="sidebar_appearance"
+			follows="left|top|right"
+			class="panel_sidetray_home_info">
+    			<text
+        			top="-10" width="200" left="5" height="30" follows="left|right|top"
+        			font="SansSerifHugeBold" text_color="white" word_wrap="true"
+        			mouse_opaque="false" name="tab_name" >
+					Appearance
+    			</text>
+    			<icon
+      				top="-10" right="-10" width="20" height="20" follows="top|right"
+      				color="1 1 1 1" enabled="true" image_name="inv_item_shirt.tga"
+      				mouse_opaque="false" name="tab_icon"/>
+  				<text
+      				top="-40" left="10" right="-10" height="120" follows="left|right|bottom"
+      				font="SansSerifBig" text_color="white" word_wrap="true"
+      				mouse_opaque="false" name="tab_description" >    
+					Change your appearance.
+  				</text>
 		</panel> 
 </panel> 
   
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ec4898448a..0ed473a01a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -409,6 +409,8 @@ this texture in your inventory
 	<string name="InvFolder Animations">Animations</string>
 	<string name="InvFolder Gestures">Gestures</string>
 	<string name="InvFolder favorite">Favorites</string>
+	<string name="InvFolder Current Outfit">Current Outfit</string>
+	<string name="InvFolder My Outfits">My Outfits</string>
 
 	<!-- inventory FVBridge -->
 	<string name="Buy">Buy</string>