summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAustin Doupnik <austin@lindenlab.com>2009-07-08 22:36:39 +0000
committerAustin Doupnik <austin@lindenlab.com>2009-07-08 22:36:39 +0000
commit163f89d77fc0ed76a8c1e79049842394f129d16b (patch)
tree62d758d4b78379d37cb6bdd98263fa0496bdccae /indra/newview
parentea1196cf01f3ff998e0d463ff2ebe29cef621362 (diff)
DEV-34748 Moved logic for setting inspection tools from construction to onOpen for LLFloaterInspect. Reviewed by Richard.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterinspect.cpp9
-rw-r--r--indra/newview/llfloaterinspect.h1
2 files changed, 7 insertions, 3 deletions
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();