summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorygallery.cpp2
-rw-r--r--indra/newview/llthumbnailctrl.cpp7
-rw-r--r--indra/newview/llthumbnailctrl.h1
-rw-r--r--indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml2
4 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 499d51c431..290688f179 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1081,7 +1081,7 @@ void LLInventoryGalleryItem::setThumbnail(LLUUID id)
mDefaultImage = id.isNull();
if(mDefaultImage)
{
- getChild<LLThumbnailCtrl>("preview_thumbnail")->setValue("Thumbnail_Fallback");
+ getChild<LLThumbnailCtrl>("preview_thumbnail")->clearTexture();
}
else
{
diff --git a/indra/newview/llthumbnailctrl.cpp b/indra/newview/llthumbnailctrl.cpp
index 1b054b4c27..340dba3717 100644
--- a/indra/newview/llthumbnailctrl.cpp
+++ b/indra/newview/llthumbnailctrl.cpp
@@ -170,6 +170,13 @@ void LLThumbnailCtrl::draw()
LLUICtrl::draw();
}
+void LLThumbnailCtrl::clearTexture()
+{
+ mImageAssetID = LLUUID::null;
+ mTexturep = nullptr;
+ mImagep = nullptr;
+}
+
// virtual
// value might be a string or a UUID
void LLThumbnailCtrl::setValue(const LLSD& value)
diff --git a/indra/newview/llthumbnailctrl.h b/indra/newview/llthumbnailctrl.h
index dc21046841..686603b373 100644
--- a/indra/newview/llthumbnailctrl.h
+++ b/indra/newview/llthumbnailctrl.h
@@ -66,6 +66,7 @@ public:
virtual void draw() override;
virtual void setValue(const LLSD& value ) override;
+ void clearTexture();
virtual BOOL handleHover(S32 x, S32 y, MASK mask) override;
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
index 05a02158c0..b343aafca5 100644
--- a/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_gallery_item.xml
@@ -16,7 +16,7 @@
<string name="worn_string">(worn)</string>
<thumbnail
name="preview_thumbnail"
- image_name="Thumbnail_Fallback"
+ fallback_image="Thumbnail_Fallback"
layout="topleft"
follows="left|top"
interactable="false"