From 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Sat, 17 Feb 2007 03:02:16 +0000 Subject: merge -r 56779:58057 /branches/selection_management --- indra/newview/lltoolview.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/lltoolview.cpp') diff --git a/indra/newview/lltoolview.cpp b/indra/newview/lltoolview.cpp index 49e5896ab7..f5c1e0b90b 100644 --- a/indra/newview/lltoolview.cpp +++ b/indra/newview/lltoolview.cpp @@ -129,7 +129,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() @@ -169,7 +169,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 ); } -- cgit v1.2.3