Second Life viewer sources 1.13.2.15

1 files changed, 3 insertions, 12 deletions

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index c9edf98..05dd70b 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -383,8 +383,7 @@ LLFloaterTools::LLFloaterTools()
         mPanelLandInfo(NULL),
 
         mTabLand(NULL),
-        mDirty(TRUE),
-        mLastTool(gToolNull)
+        mDirty(TRUE)
 {
         mAutoFocus = FALSE;
         LLCallbackMap::map_t factory_map;
@@ -949,21 +948,13 @@ void LLFloaterTools::onClickGridOptions(void* data)
         //floaterp->addDependentFloater(LLFloaterBuildOptions::getInstance(), FALSE);
 }
 
-void LLFloaterTools::saveLastTool()
-{
-        mLastTool = gToolMgr->getCurrentTool( MASK_NONE );
-}
-
 void LLFloaterTools::setEditTool(void* tool_pointer)
 {
         select_tool(tool_pointer);
-        if(gFloaterTools && tool_pointer != gToolNull)
-        {
-                gFloaterTools->saveLastTool();
-        }
 }
 
 void LLFloaterTools::onFocusReceived()
 {
-        select_tool(mLastTool);
+        gCurrentToolset = gBasicToolset;
+        gCurrentToolset->selectTool(gCurrentToolset->getSelectedTool());
 }
\ No newline at end of file