diff options
| author | angela <angela@lindenlab.com> | 2009-11-20 09:55:19 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-20 09:55:19 +0800 |
| commit | d670d84147f0cac1255aae2e463d17de3a87624e (patch) | |
| tree | 059f7bd73b9fc80b4f19a166aae4cf5467794aa5 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 496ad115b102111cb394c09663d9da579f07b606 (diff) | |
| parent | 53f4bedaa57898c0b6b090ef29ad4f70a9c34ee4 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index b1fbf789c6..dbe0ec3b86 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1158,10 +1158,17 @@ void LLTaskLSLBridge::openItem() { return; } - LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", LLSD(mUUID), TAKE_FOCUS_YES); - if (preview && (object->permModify() || gAgent.isGodlike())) + if (object->permModify() || gAgent.isGodlike()) { - preview->setObjectID(mPanel->getTaskUUID()); + LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", LLSD(mUUID), TAKE_FOCUS_YES); + if (preview) + { + preview->setObjectID(mPanel->getTaskUUID()); + } + } + else + { + LLNotifications::instance().add("CannotOpenScriptObjectNoMod"); } } |