summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-02-25 17:06:06 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-02-25 17:06:06 +0200
commit5705a2c0181a9376db5eadf6ccf97e0675f6afb5 (patch)
tree9db7fe026b257ffd42226f75d680c48c2f278833
parent0b9eeb02abe4d10c4e252fe35ea55ba4b54b581e (diff)
MAINT-3671 Fix is changed to solve issue with other multi-previews
-rwxr-xr-xindra/newview/llpreview.cpp2
-rwxr-xr-xindra/newview/llpreviewscript.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 04934b13f1..2caf186b70 100755
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -91,6 +91,7 @@ void LLPreview::setObjectID(const LLUUID& object_id)
{
loadAsset();
}
+ refreshFromItem();
}
void LLPreview::setItem( LLInventoryItem* item )
@@ -100,6 +101,7 @@ void LLPreview::setItem( LLInventoryItem* item )
{
loadAsset();
}
+ refreshFromItem();
}
const LLInventoryItem *LLPreview::getItem() const
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 26c46d543c..18bbf110f7 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1879,7 +1879,7 @@ void LLLiveLSLEditor::loadAsset()
mIsModifiable = item && gAgent.allowOperation(PERM_MODIFY,
item->getPermissions(),
GP_OBJECT_MANIPULATE);
- refreshFromItem();
+
// This is commented out, because we don't completely
// handle script exports yet.
/*