aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterinspect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloaterinspect.cpp')
-rw-r--r--linden/indra/newview/llfloaterinspect.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index c926afa..f494251 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -55,10 +55,10 @@ LLFloaterInspect::~LLFloaterInspect(void)
55 { 55 {
56 if(gToolMgr->getBaseTool() == gToolInspect) 56 if(gToolMgr->getBaseTool() == gToolInspect)
57 { 57 {
58 select_tool(gToolNull); 58 gToolMgr->clearTransientTool();
59 } 59 }
60 // Switch back to basic toolset 60 // Switch back to basic toolset
61 gToolMgr->setCurrentToolset(gBasicToolset); 61 gToolMgr->setCurrentToolset(gBasicToolset);
62 } 62 }
63 else 63 else
64 { 64 {
@@ -85,7 +85,7 @@ void LLFloaterInspect::show(void* ignored)
85 } 85 }
86 86
87 sInstance->open(); 87 sInstance->open();
88 select_tool(gToolInspect); 88 gToolMgr->setTransientTool(gToolInspect);
89 gSelectMgr->setForceSelection(forcesel); // restore previouis value 89 gSelectMgr->setForceSelection(forcesel); // restore previouis value
90 90
91 sInstance->mObjectSelection = gSelectMgr->getSelection(); 91 sInstance->mObjectSelection = gSelectMgr->getSelection();
@@ -256,7 +256,7 @@ void LLFloaterInspect::refresh()
256 256
257void LLFloaterInspect::onFocusReceived() 257void LLFloaterInspect::onFocusReceived()
258{ 258{
259 select_tool(gToolInspect); 259 gToolMgr->setTransientTool(gToolInspect);
260} 260}
261 261
262void LLFloaterInspect::dirty() 262void LLFloaterInspect::dirty()