diff options
| author | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-20 17:18:46 -0800 |
|---|---|---|
| committer | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-20 17:18:46 -0800 |
| commit | 3ea3f52aedd1efc568b01c8f618c5bbe805f61db (patch) | |
| tree | 11790cd07a5ebc39b16c409956d7bf900424f7f1 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 1d5775a23fbcf00ad3e459393a7cf1d80a762bf8 (diff) | |
| parent | 1d9d099baae1b502f4fae02238330c06bf49adb2 (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"); } } |