diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
| commit | 7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch) | |
| tree | 99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/newview/llfloatertools.cpp | |
| parent | 47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff) | |
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 11665f484a..c9a28ab361 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -364,8 +364,7 @@ LLFloaterTools::LLFloaterTools() mPanelLandInfo(NULL), mTabLand(NULL), - mDirty(TRUE), - mLastTool(gToolNull) + mDirty(TRUE) { mAutoFocus = FALSE; LLCallbackMap::map_t factory_map; @@ -930,21 +929,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 |