From 20e445b4befd974eee9eed65e8d0365f13be7675 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 18 Jul 2012 20:26:19 -0400 Subject: [PATCH] Added icons for folders from phoenix, and created outbox folder icon for future use. --- indra/newview/llviewerfoldertype.cpp | 14 +++++++------- .../default/textures/inv_folder_favorite.tga | Bin 0 -> 1068 bytes .../skins/default/textures/inv_folder_inbox.tga | Bin 0 -> 2085 bytes .../skins/default/textures/inv_folder_mesh.tga | Bin 0 -> 674 bytes .../skins/default/textures/inv_folder_outbox.tga | Bin 0 -> 654 bytes .../skins/default/textures/inv_folder_outfit.tga | Bin 0 -> 603 bytes .../newview/skins/default/textures/textures.xml | 15 +++++++++++++-- 7 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 indra/newview/skins/default/textures/inv_folder_favorite.tga create mode 100644 indra/newview/skins/default/textures/inv_folder_inbox.tga create mode 100644 indra/newview/skins/default/textures/inv_folder_mesh.tga create mode 100644 indra/newview/skins/default/textures/inv_folder_outbox.tga create mode 100644 indra/newview/skins/default/textures/inv_folder_outfit.tga diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp index 8c7184ede..419d5d690 100644 --- a/indra/newview/llviewerfoldertype.cpp +++ b/indra/newview/llviewerfoldertype.cpp @@ -125,15 +125,15 @@ LLViewerFolderDictionary::LLViewerFolderDictionary() addEntry(LLFolderType::FT_LOST_AND_FOUND, new ViewerFolderEntry("Lost And Found", "inv_folder_lostandfound.tga", "inv_folder_lostandfound.tga", TRUE, false)); addEntry(LLFolderType::FT_ANIMATION, new ViewerFolderEntry("Animations", "inv_folder_animation.tga", "inv_folder_animation.tga", FALSE, false)); addEntry(LLFolderType::FT_GESTURE, new ViewerFolderEntry("Gestures", "inv_folder_gesture.tga", "inv_folder_gesture.tga", FALSE, false)); - addEntry(LLFolderType::FT_FAVORITE, new ViewerFolderEntry("Favorites", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", FALSE, false)); + addEntry(LLFolderType::FT_FAVORITE, new ViewerFolderEntry("Favorites", "inv_folder_favorite.tga", "inv_folder_favorite.tga", FALSE, false)); - addEntry(LLFolderType::FT_CURRENT_OUTFIT, new ViewerFolderEntry("Current Outfit", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", TRUE, false)); - addEntry(LLFolderType::FT_OUTFIT, new ViewerFolderEntry("New Outfit", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", TRUE, false)); - addEntry(LLFolderType::FT_MY_OUTFITS, new ViewerFolderEntry("My Outfits", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", TRUE, false)); - addEntry(LLFolderType::FT_MESH, new ViewerFolderEntry("Meshes", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", FALSE, false)); + addEntry(LLFolderType::FT_CURRENT_OUTFIT, new ViewerFolderEntry("Current Outfit", "inv_folder_outfit.tga", "inv_folder_outfit.tga", TRUE, false)); + addEntry(LLFolderType::FT_OUTFIT, new ViewerFolderEntry("New Outfit", "inv_folder_outfit.tga", "inv_folder_outfit.tga", TRUE, false)); + addEntry(LLFolderType::FT_MY_OUTFITS, new ViewerFolderEntry("My Outfits", "inv_folder_outfit.tga", "inv_folder_outfit.tga", TRUE, false)); + addEntry(LLFolderType::FT_MESH, new ViewerFolderEntry("Meshes", "inv_folder_mesh.tga", "inv_folder_mesh.tga", FALSE, false)); - addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Inbox", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", FALSE, false)); - addEntry(LLFolderType::FT_OUTBOX, new ViewerFolderEntry("Outbox", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", FALSE, false)); + addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Inbox", "inv_folder_inbox.tga", "inv_folder_inbox.tga", FALSE, false)); + addEntry(LLFolderType::FT_OUTBOX, new ViewerFolderEntry("Outbox", "inv_folder_outbox.tga", "inv_folder_outbox", FALSE, false)); addEntry(LLFolderType::FT_BASIC_ROOT, new ViewerFolderEntry("Basic Root", "inv_folder_plain_open.tga", "inv_folder_plain_closed.tga", FALSE, false)); diff --git a/indra/newview/skins/default/textures/inv_folder_favorite.tga b/indra/newview/skins/default/textures/inv_folder_favorite.tga new file mode 100644 index 0000000000000000000000000000000000000000..a6c807d124441c05d8c03a49c78bb7627ca38617 GIT binary patch literal 1068 zcmZQzU}As)0R{mE1r8XG3iN-V8RTFFhBq$P5hqAiY4`eBr}?uh5JCRpod8 zSC-!O-!bI$|C)Jk;AZ2~-}CV6fA5To|CMES|5ri6PGM*Mx32pHHv^abdCMRF*V5RB zq8DV2y276SX)_7myOHe%u|fU_&%8m<{(`m7{~MYe`mYMK&(!|te+$>+ z|5X%r|JT(z@IPbzLxT2Ce*g17$c%*kyZ@^WzW(2M=KcTV$@l(eEq?TW!i(>C?FYpn zF&Gp_=>7-sabZyU!itd-Jy6Z}@899}gVPbv9NV)bG-k#3?PL7}c; Rp242}e!3BEo<6R63;@i3+Nl5l literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/inv_folder_inbox.tga b/indra/newview/skins/default/textures/inv_folder_inbox.tga new file mode 100644 index 0000000000000000000000000000000000000000..04539c2cc4f002c9c1c4724215e5b7cf08cfb177 GIT binary patch literal 2085 zcmeHF!A`fKet>f010sZRfwUbA~8l2HhG<$H#7UTvr}RRY`My;%%l@WL_Y$4EbRj5voIthO}`E3 zE$dUh3Hc}d$|8pYdYO7&t0)TDwoScWF9Yz17u8#qMU%;dMxzmp$77n!X2QY;k9bkN zX__KGiXsYvfHX}L7Cz2H9RIlK{*L2N9LLmdx2amKlIMBC!UvCdk-jX;RIAm<_kBu| zgr?J}u<*enUZjtnx~@yZ;gGuBuIM2weDH{G(#IQagFOAB`N4eUfy=FCAMwRvvC@YI zAnHEm>~ntJK2KvgV|n?1fqO0S8}8RX=z#j9n;oU256+|u!+5d#_l~4mMkRCg`H__2 z)`@HFrhcoo)W+5MovdEgD{T8gXsjQ$_kXnmP5sewq}D_KS!xdYyGb9O9={i62jLCQ C7t+N5 literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/inv_folder_mesh.tga b/indra/newview/skins/default/textures/inv_folder_mesh.tga new file mode 100644 index 0000000000000000000000000000000000000000..be95f00079ec99da1a44cf821034cb4be25b0be7 GIT binary patch literal 674 zcmaJBb5Ismp3>NYe{BJZC7RG2Sv^hj76)^~k$A<(3L_-8rR3eBU1PO2LHbV z49dKIVCOc1^m7MCFYnl^WwCpo?twXpk-*$vfyy^lR?D2xN(_m{CCQk=VY^8wL%kG3 z;Nj~nX=1RrN>ZvKgRAhJ&PeIQ*)87Oq_Fr&NV3&L=*mNLXi(p&HgmuB-&s>bU|A~_ zWQd;Q1=;u89pv6Vq4KS{pS1^cv5Y02zH~vJk%`@IxBHC~R{2E{6iUm%#%X}yVpm?F Fm@nB0lXCz7 literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/inv_folder_outbox.tga b/indra/newview/skins/default/textures/inv_folder_outbox.tga new file mode 100644 index 0000000000000000000000000000000000000000..589348221b1784594eed8ba1763d2cd9f3ceaccc GIT binary patch literal 654 zcmZWnze_?<6uxFuwB*(r?zQ<32r5DpSV@E6j|Kx!u%H68YC%1Xp znEsX6GK8(c01w?R{C@wJ*Xu|&1Ms| zS`GDj9bL|oB}{xQ7F$p7I3Ae&1Ctkr#xr{&{@J+Y2+wD*k1wEd$-EIp@ zn0Tktxtf4l^E{uUIvj$Ff2~$4ve_&$nG7P42i_79YbzaJgI}N4gy81Vy3lVVzg5qC^g;QdjdoCPa_nG_j~VaZhco_XJcQ74^#c=v{;p`Y@KOsI96I9X~F$JuV24}rhoffCTLX?08neG7YlJj zphYSW8tC0TT54ZEsNyDXdnuhDuO{?e)#5SL7VbWN45QlK{oBkCwP*r5N88NjtN61P zv1-lJr%$_2cyN3hBLMbbxt}512nUm?T?Uh}keFydiWwjw5*$o2ZI53xdjD3!Qtj4k c{|($c&lQoxN?WK<=m=SiDIp!>+V5lL7fEYIu>b%7 literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 973f76923..3552b3eaf 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -105,11 +105,16 @@ + + + + + @@ -147,7 +152,7 @@ - + @@ -370,6 +375,9 @@ + + + @@ -396,7 +404,10 @@ - + + + +