diff options
| author | James Cook <james@lindenlab.com> | 2009-11-20 14:45:51 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-20 14:45:51 -0800 |
| commit | cbbb107d1f71f8a8474abbe7e1747a4332f6aa0e (patch) | |
| tree | 15d8abf1822a31755783b2447abd5afb33a8f3ce /indra/newview/llpanelobjectinventory.cpp | |
| parent | 3bb86f91bc345f74057debe1f8f680098895a40e (diff) | |
| parent | 67c832d94b53fb5d32ec27eebf7f57b668e899db (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"); } } |