From ec6be24ed54cbc2267f45ce753998261f727577e Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Wed, 2 Jun 2010 13:59:07 +0300 Subject: EXT-2704 FIXED added custom inventory folder icons Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/488/ --HG-- branch : product-engine --- indra/newview/llinventorybridge.cpp | 29 ++++++++++++++++++--- .../default/textures/icons/Inv_LostClosed.png | Bin 0 -> 3033 bytes .../skins/default/textures/icons/Inv_LostOpen.png | Bin 0 -> 3223 bytes .../skins/default/textures/icons/Inv_SysClosed.png | Bin 0 -> 3153 bytes .../skins/default/textures/icons/Inv_SysOpen.png | Bin 0 -> 3251 bytes .../default/textures/icons/Inv_TrashClosed.png | Bin 0 -> 2978 bytes .../skins/default/textures/icons/Inv_TrashOpen.png | Bin 0 -> 2970 bytes indra/newview/skins/default/textures/textures.xml | 6 +++++ 8 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Inv_LostClosed.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_LostOpen.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_SysClosed.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_SysOpen.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_TrashClosed.png create mode 100644 indra/newview/skins/default/textures/icons/Inv_TrashOpen.png (limited to 'indra/newview') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 577652fc79..1f87b14ddd 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2333,10 +2333,20 @@ LLUIImagePtr LLFolderBridge::getIcon(LLFolderType::EType preferred_type, BOOL is else return LLUI::getUIImage("Inv_FolderClosed_Link"); } - if (preferred_type == LLFolderType::FT_OUTFIT) + + switch (preferred_type) + { + case LLFolderType::FT_OUTFIT: return LLUI::getUIImage("Inv_LookFolderClosed"); - else + case LLFolderType::FT_LOST_AND_FOUND: + return LLUI::getUIImage("Inv_LostClosed"); + case LLFolderType::FT_TRASH: + return LLUI::getUIImage("Inv_TrashClosed"); + case LLFolderType::FT_NONE: return LLUI::getUIImage("Inv_FolderClosed"); + default: + return LLUI::getUIImage("Inv_SysClosed"); + } } LLUIImagePtr LLFolderBridge::getOpenIcon() const @@ -2350,10 +2360,21 @@ LLUIImagePtr LLFolderBridge::getOpenIcon() const else return LLUI::getUIImage("Inv_FolderOpen_Link"); } - if (getPreferredType() == LLFolderType::FT_OUTFIT) + + switch (getPreferredType()) + { + case LLFolderType::FT_OUTFIT: return LLUI::getUIImage("Inv_LookFolderOpen"); - else + case LLFolderType::FT_LOST_AND_FOUND: + return LLUI::getUIImage("Inv_LostOpen"); + case LLFolderType::FT_TRASH: + return LLUI::getUIImage("Inv_TrashOpen"); + case LLFolderType::FT_NONE: return LLUI::getUIImage("Inv_FolderOpen"); + default: + return LLUI::getUIImage("Inv_SysOpen"); + } + } BOOL LLFolderBridge::renameItem(const std::string& new_name) diff --git a/indra/newview/skins/default/textures/icons/Inv_LostClosed.png b/indra/newview/skins/default/textures/icons/Inv_LostClosed.png new file mode 100644 index 0000000000..a800217e0d Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_LostClosed.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_LostOpen.png b/indra/newview/skins/default/textures/icons/Inv_LostOpen.png new file mode 100644 index 0000000000..8c4a1a9ac0 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_LostOpen.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png new file mode 100644 index 0000000000..dcf998449f Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png new file mode 100644 index 0000000000..0efd403c95 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png b/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png new file mode 100644 index 0000000000..c5201e6f9a Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png b/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png new file mode 100644 index 0000000000..4a886a3f37 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 072ea40ee4..896bdae4ff 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -203,6 +203,8 @@ with the same filename but different name + + @@ -216,8 +218,12 @@ with the same filename but different name + + + + -- cgit v1.2.3