SL-19108 Fix folders not showing thumbnails

2 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 421c1c9754..cc8e20485b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2339,6 +2339,16 @@ LLFontGL::StyleFlags LLFolderBridge::getLabelStyle() const
     return LLFontGL::NORMAL;
 }
 
+const LLUUID& LLFolderBridge::getThumbnailUUID() const
+{
+    LLViewerInventoryCategory* cat = getCategory();
+    if (cat)
+    {
+        return cat->getThumbnailUUID();
+    }
+    return LLUUID::null;
+}
+
 void LLFolderBridge::update()
 {
 	// we know we have children but  haven't  fetched them (doesn't obey filter)
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 958d284854..eaa7166631 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -299,6 +299,7 @@ public:
 	static LLUIImagePtr getIcon(LLFolderType::EType preferred_type);
 	virtual std::string getLabelSuffix() const;
 	virtual LLFontGL::StyleFlags getLabelStyle() const;
+    virtual const LLUUID& getThumbnailUUID() const;
 
 	void setShowDescendantsCount(bool show_count) {mShowDescendantsCount = show_count;}