From c994b57fa483d09367546d27434c25a316d86fe0 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 19 Nov 2009 16:29:20 -0800 Subject: EXT-2490 Right click context menu for objects should include build tools EXT-2541 Help > Report Abuse screenshot not showing up EXT-2549 Crash on exit from mouse-look (Mini Map related) EXT-2548 Viewer freezes when going out of the mouselook while there are more than two floaters EXT-1983 [BSI] Trying to edit a script in a no mod object pops up script editor with "object out of range" reviewed by Richard --- indra/newview/llpanelobjectinventory.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpanelobjectinventory.cpp') 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("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("preview_scriptedit", LLSD(mUUID), TAKE_FOCUS_YES); + if (preview) + { + preview->setObjectID(mPanel->getTaskUUID()); + } + } + else + { + LLNotifications::instance().add("CannotOpenScriptObjectNoMod"); } } -- cgit v1.2.3