diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-08-12 19:03:20 +0000 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-08-12 19:03:20 +0000 |
commit | 7bbc5cdea6beb4e05c26d1472f789fe6fa536ee3 (patch) | |
tree | 9e496156bb377c9bdf0b793a1b07b72dfa4f032c /indra/newview/skins | |
parent | 0bf4b5f2222ffb8171be094613363427f3b8470a (diff) |
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.
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png | bin | 0 -> 808 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png | bin | 0 -> 835 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_inventory.xml | 16 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory.xml | 24 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_side_tray.xml | 22 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml | 25 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
8 files changed, 91 insertions, 1 deletions
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png Binary files differnew file mode 100644 index 0000000000..2dc32a576b --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Off.png diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png Binary files differnew file mode 100644 index 0000000000..bea218a2fb --- /dev/null +++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Appearance_Selected.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 69742c6ecd..4b6f8ac43c 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -174,6 +174,9 @@ <texture name="Stepper_Up_Off" file_name="widgets/Stepper_Up_Off.png" preload="true"/> <texture name="Stepper_Up_Press" file_name="widgets/Stepper_Up_Press.png" preload="true"/> + <texture name="TabIcon_Appearance_Off" file_name="taskpanel/TabIcon_Appearance_Off.png" preload="false" /> + <texture name="TabIcon_Appearance_Over" file_name="taskpanel/TabIcon_Appearance_Over.png" preload="false"/> + <texture name="TabIcon_Appearance_Selected" file_name="taskpanel/TabIcon_Appearance_Selected.png" preload="false" /> <texture name="TabIcon_Close_Off" file_name="taskpanel/TabIcon_Close_Off.png" preload="false" /> <texture name="TabIcon_Close_Over" file_name="taskpanel/TabIcon_Close_Over.png" preload="false"/> <texture name="TabIcon_Home_Off" file_name="taskpanel/TabIcon_Home_Off.png" preload="false" /> 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> |