summaryrefslogtreecommitdiff
path: root/indra/newview/llpreview.cpp
diff options
context:
space:
mode:
authordavep <none@none>2014-08-27 13:04:32 -0500
committerdavep <none@none>2014-08-27 13:04:32 -0500
commit749d1665643b33d6c5b7b97e43f4eae996fbf465 (patch)
treeeea7beb291f9fbffd5284da4f55701dcf5286720 /indra/newview/llpreview.cpp
parentd0428575fb9c3d285dc32e61808a877cb24efa89 (diff)
parentb021c90e7bccdd0f9a916946e7716a00034254c2 (diff)
Automated merge with https://bitbucket.org/davep/viewer-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