From 163f89d77fc0ed76a8c1e79049842394f129d16b Mon Sep 17 00:00:00 2001 From: Austin Doupnik Date: Wed, 8 Jul 2009 22:36:39 +0000 Subject: DEV-34748 Moved logic for setting inspection tools from construction to onOpen for LLFloaterInspect. Reviewed by Richard. --- indra/newview/llfloaterinspect.cpp | 9 ++++++--- indra/newview/llfloaterinspect.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp index aa615ef342..9f8446210e 100644 --- a/indra/newview/llfloaterinspect.cpp +++ b/indra/newview/llfloaterinspect.cpp @@ -66,9 +66,6 @@ BOOL LLFloaterInspect::postBuild() // childSetAction("button creator",onClickCreatorProfile, this); // childSetCommitCallback("object_list", onSelectObject, NULL); - BOOL forcesel = LLSelectMgr::getInstance()->setForceSelection(TRUE); - LLToolMgr::getInstance()->setTransientTool(LLToolCompInspect::getInstance()); - LLSelectMgr::getInstance()->setForceSelection(forcesel); // restore previouis value mObjectSelection = LLSelectMgr::getInstance()->getSelection(); refresh(); @@ -118,6 +115,12 @@ void LLFloaterInspect::show(void* ignored) sInstance->refresh(); } */ +void LLFloaterInspect::onOpen(const LLSD& key) +{ + BOOL forcesel = LLSelectMgr::getInstance()->setForceSelection(TRUE); + LLToolMgr::getInstance()->setTransientTool(LLToolCompInspect::getInstance()); + LLSelectMgr::getInstance()->setForceSelection(forcesel); // restore previouis value +} void LLFloaterInspect::onClickCreatorProfile() { if(mObjectList->getAllSelected().size() == 0) diff --git a/indra/newview/llfloaterinspect.h b/indra/newview/llfloaterinspect.h index a65ccaa66e..ce9485ee74 100644 --- a/indra/newview/llfloaterinspect.h +++ b/indra/newview/llfloaterinspect.h @@ -48,6 +48,7 @@ class LLFloaterInspect : public LLFloater public: // static void show(void* ignored = NULL); + void onOpen(const LLSD& key); virtual BOOL postBuild(); void dirty(); LLUUID getSelectedUUID(); -- cgit v1.2.3