summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-06-02 13:59:07 +0300
committerIgor Borovkov <iborovkov@productengine.com>2010-06-02 13:59:07 +0300
commitec6be24ed54cbc2267f45ce753998261f727577e (patch)
treee0ed113e508ed95427e91bef222334d1f0795a72 /indra/newview/llinventorybridge.cpp
parenta543a1276e31ee165cbec8c3ed04961b2423ccac (diff)
EXT-2704 FIXED added custom inventory folder icons
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/488/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp29
1 files changed, 25 insertions, 4 deletions
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)