diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
commit | c25105945a9d74e331cae4d827fc3be8d8915b7a (patch) | |
tree | 894c4f663fecc5659e2e1afbe7a815fd0b921f4f /indra/newview/llpreviewscript.cpp | |
parent | f5c7d69317af103b5f5f762d7e0adb82f12a71b3 (diff) | |
parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rwxr-xr-x | indra/newview/llpreviewscript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 9ff0ece7d9..9411b8265b 100755 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -1851,7 +1851,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. /* |