summaryrefslogtreecommitdiff
path: root/indra/newview/llpreview.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-07-21 14:48:30 -0400
committerOz Linden <oz@lindenlab.com>2014-07-21 14:48:30 -0400
commitdf3e6b40fd80a139e745106231bc5c752271beea (patch)
treec52227a2428060c5f3ffd7a1f97725c45adedb3a /indra/newview/llpreview.cpp
parent8192a3c5b2addd63e1d5c12269eec7e6de2adde0 (diff)
parent532433674c9553636af9ea8d433b9da6d6fae587 (diff)
merge changes for 3.7.12-release
Diffstat (limited to 'indra/newview/llpreview.cpp')
-rwxr-xr-xindra/newview/llpreview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 6d032ad3d3..398f4e6e42 100755
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -90,6 +90,7 @@ void LLPreview::setObjectID(const LLUUID& object_id)
{
loadAsset();
}
+ refreshFromItem();
}
void LLPreview::setItem( LLInventoryItem* item )
@@ -99,6 +100,7 @@ void LLPreview::setItem( LLInventoryItem* item )
{
loadAsset();
}
+ refreshFromItem();
}
const LLInventoryItem *LLPreview::getItem() const