diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llfloaterinspect.cpp | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llfloaterinspect.cpp')
| -rw-r--r-- | indra/newview/llfloaterinspect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp index 388e8d9cbd..730d934131 100644 --- a/indra/newview/llfloaterinspect.cpp +++ b/indra/newview/llfloaterinspect.cpp @@ -35,10 +35,10 @@ LLFloaterInspect::~LLFloaterInspect(void) { if(gToolMgr->getBaseTool() == gToolInspect) { - select_tool(gToolNull); + gToolMgr->clearTransientTool(); } // Switch back to basic toolset - gToolMgr->setCurrentToolset(gBasicToolset); + gToolMgr->setCurrentToolset(gBasicToolset); } else { @@ -65,7 +65,7 @@ void LLFloaterInspect::show(void* ignored) } sInstance->open(); - select_tool(gToolInspect); + gToolMgr->setTransientTool(gToolInspect); gSelectMgr->setForceSelection(forcesel); // restore previouis value sInstance->mObjectSelection = gSelectMgr->getSelection(); @@ -236,7 +236,7 @@ void LLFloaterInspect::refresh() void LLFloaterInspect::onFocusReceived() { - select_tool(gToolInspect); + gToolMgr->setTransientTool(gToolInspect); } void LLFloaterInspect::dirty() |