Second Life viewer sources 1.14.0.0

1 files changed, 2 insertions, 3 deletions

diff --git a/linden/indra/newview/lltoolview.cpp b/linden/indra/newview/lltoolview.cpp
index 5b80339..fa8d65b 100644
--- a/linden/indra/newview/lltoolview.cpp
+++ b/linden/indra/newview/lltoolview.cpp
@@ -148,7 +148,7 @@ void LLToolView::draw()
 {
         // turn off highlighting for all containers 
         // and hide all option panels except for the selected one.
-        LLTool* selected = gCurrentToolset->getSelectedTool();
+        LLTool* selected = gToolMgr->getCurrentToolset()->getSelectedTool();
         for( LLToolContainer* contain = mContainList.getFirstData();
                  contain != NULL;
                  contain = mContainList.getNextData()
@@ -188,7 +188,6 @@ void LLToolView::onClickToolButton(void* userdata)
         LLToolContainer* clicked = (LLToolContainer*) userdata;
 
         // Switch to this one
-        gCurrentToolset->selectTool( clicked->mTool );
-        gToolMgr->useSelectedTool( gCurrentToolset );
+        gToolMgr->getCurrentToolset()->selectTool( clicked->mTool );
 }