diff options
| author | James Cook <james@lindenlab.com> | 2009-11-20 09:46:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-20 09:46:23 -0800 |
| commit | fc04d5bbb8b51b9ca39d1a3a1de0991de09cdb58 (patch) | |
| tree | 0cc35255caa59f0f616ccb328bd42824505bfffc /indra/newview/llpanelobjectinventory.cpp | |
| parent | ba3f7965e35e4eb0d7fcecc7267ec3af5f2d8d87 (diff) | |
| parent | 644ee3f5ded17513e09de8c62a2bafe69ceb03d6 (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"); } } |