svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

This merges in all appearance side panel bug fixes.

6 files changed, 7 insertions, 62 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1515a34eeb..ad208806b7 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -414,6 +414,8 @@
   <texture name="inv_item_jacket.tga"/>
   <texture name="inv_item_landmark.tga"/>
   <texture name="inv_item_landmark_visited.tga"/>
+  <texture name="inv_item_linkitem.tga"/>
+  <texture name="inv_item_linkfolder.tga"/>
   <texture name="inv_item_notecard.tga"/>
   <texture name="inv_item_object.tga"/>
   <texture name="inv_item_object_multi.tga"/>
diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml
index 41bd417c12..824df082d8 100644
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
@@ -3561,14 +3561,4 @@ scratch and wear it.
      name="Ok"
      right="-116"
      width="100" />
-    <button
-     follows="left|bottom"
-     height="20"
-     label="Make Outfit..."
-     label_selected="Make Outfit..."
-     layout="topleft"
-     left_delta="-178"
-     name="Make Outfit"
-     top_delta="0"
-     width="100" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory.xml b/indra/newview/skins/default/xui/en/floater_inventory.xml
index 610c62a21a..37c6cbf391 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory.xml
@@ -207,22 +207,6 @@
                  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 dd8acea4ed..7762a7f667 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -77,30 +77,6 @@
          parameter="category" />
     </menu_item_call>
     <menu_item_call
-     label="New Current"
-     layout="topleft"
-     name="New Current">
-        <menu_item_call.on_click
-         function="Inventory.DoCreate"
-         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">
@@ -338,14 +314,6 @@
              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_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 7ea059ba6a..e87517e200 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
@@ -149,11 +149,11 @@
          text_color="white"
          top="40"
          word_wrap="true">
-            Change your profile, your look and quick links to your outfits.
+            Change your profile.
         </text>
     </panel>
     <panel
-     background_visible="true" 
+     background_visible="true"
      bg_alpha_color="DkGray2"
      class="panel_sidetray_home_info"
      follows="left|top|right"
@@ -197,7 +197,7 @@
          text_color="white"
          top="40"
          word_wrap="true">
-            Change your appearance.
+            Change your apperance and looks.
         </text>
-    </panel> 
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fb1aa25b25..f89625c535 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -149,6 +149,7 @@
 	<string name="gesture">gesture</string>															
 	<string name="simstate">simstate</string>																
 	<string name="favorite">favorite</string>															
+	<string name="symbolic link">link</string>															
 	
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>