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/default/textures | |
| 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/default/textures')
| -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 |
3 files changed, 3 insertions, 0 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" /> |
