1 files changed, 80 insertions, 128 deletions

diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 68a3e77..b6e14a2 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -53,7 +53,6 @@ LLToolMgr*		gToolMgr	= NULL;
 // Used when app not active to avoid processing hover.
 LLTool*                 gToolNull       = NULL;
 
-LLToolset*              gCurrentToolset         = NULL;
 LLToolset*              gBasicToolset           = NULL;
 LLToolset*              gCameraToolset          = NULL;
 //LLToolset*            gLandToolset            = NULL;
@@ -65,10 +64,12 @@ LLToolset*		gFaceEditToolset	= NULL;
 
 LLToolMgr::LLToolMgr()
         :
-        mCurrentTool(NULL), 
+        mBaseTool(NULL), 
         mSavedTool(NULL),
         mTransientTool( NULL ),
-        mOverrideTool( NULL )
+        mOverrideTool( NULL ),
+        mSelectedTool( NULL ),
+        mCurrentToolset( NULL )
 {
         gToolNull = new LLTool(NULL);  // Does nothing
         setCurrentTool(gToolNull);
@@ -78,8 +79,6 @@ LLToolMgr::LLToolMgr()
 //      gLandToolset            = new LLToolset();
         gMouselookToolset       = new LLToolset();
         gFaceEditToolset        = new LLToolset();
-
-        gCurrentToolset = gBasicToolset;
 }
 
 void LLToolMgr::initTools()
@@ -197,8 +196,8 @@ void LLToolMgr::initTools()
         gToolObjPicker = new LLToolObjPicker();
 
         // On startup, use "select" tool
+        setCurrentToolset(gBasicToolset);
         gBasicToolset->selectTool( gToolPie );
-        useSelectedTool( gBasicToolset );
 }
 
 LLToolMgr::~LLToolMgr()
@@ -267,138 +266,103 @@ LLToolMgr::~LLToolMgr()
         gToolNull = NULL;
 }
 
-
-void LLToolMgr::useSelectedTool( LLToolset* vp )
-{
-        setCurrentTool( vp->getSelectedTool() ); 
-}
-
 BOOL LLToolMgr::usingTransientTool()
 {
         return mTransientTool ? TRUE : FALSE;
 }
 
-void LLToolMgr::setCurrentTool( LLTool* tool )
+void LLToolMgr::setCurrentToolset(LLToolset* current)
 {
-        if (tool == mCurrentTool)
+        if (!current) return;
+
+        // switching toolsets?
+        if (current != mCurrentToolset)
         {
-                // didn't change tool, so don't mess with
-                // handleSelect or handleDeselect
-                return;
+                // deselect current tool
+                if (mSelectedTool)
+                {
+                        mSelectedTool->handleDeselect();
+                }
+                mCurrentToolset = current;
+                // select first tool of new toolset only if toolset changed
+                mCurrentToolset->selectFirstTool();
         }
+        // update current tool based on new toolset
+        setCurrentTool( mCurrentToolset->getSelectedTool() );
+}
+
+LLToolset* LLToolMgr::getCurrentToolset()
+{
+        return mCurrentToolset;
+}
 
+void LLToolMgr::setCurrentTool( LLTool* tool )
+{
         if (mTransientTool)
         {
-                mTransientTool->handleDeselect();
                 mTransientTool = NULL;
         }
-        else if( mCurrentTool )
-        {
-                mCurrentTool->handleDeselect();
-        }
 
-        mCurrentTool = tool;
-        if (mCurrentTool)
-        {
-                mCurrentTool->handleSelect();
-        }
+        mBaseTool = tool;
+        updateToolStatus();
 }
 
-LLTool* LLToolMgr::getCurrentTool(MASK override_mask)
+LLTool* LLToolMgr::getCurrentTool()
 {
-        // In mid-drag, always keep the current tool
-        if (gToolTranslate->hasMouseCapture()
-                || gToolRotate->hasMouseCapture()
-                || gToolStretch->hasMouseCapture())
-        {
-                // might have gotten here by overriding another tool
-                if (mOverrideTool)
-                {
-                        return mOverrideTool;
-                }
-                else
-                {
-                        return mCurrentTool;
-                }
-        }
+        MASK override_mask = gKeyboard->currentMask(TRUE);
 
+        LLTool* cur_tool = NULL;
+        // always use transient tools if available
         if (mTransientTool)
         {
                 mOverrideTool = NULL;
-                return mTransientTool;
+                cur_tool = mTransientTool;
         }
-
-        if (mCurrentTool == gToolGun)
+        // tools currently grabbing mouse input will stay active
+        else if (mSelectedTool && mSelectedTool->hasMouseCapture())
         {
-                mOverrideTool = NULL;
-                return mCurrentTool;
+                cur_tool = mSelectedTool;
         }
-
-        // ALT always gets you the camera tool
-        if (override_mask & MASK_ALT)
+        else
         {
-                mOverrideTool = gToolCamera;
-                return mOverrideTool;
-        }
+                mOverrideTool = mBaseTool ? mBaseTool->getOverrideTool(override_mask) : NULL;
 
-        if (mCurrentTool == gToolCamera)
-        {
-                // ...can't switch out of camera
-                mOverrideTool = NULL;
-                return mCurrentTool;
-        }
-        else if (mCurrentTool == gToolGrab)
-        {
-                // ...can't switch out of grab
-                mOverrideTool = NULL;
-                return mCurrentTool;
+                // use override tool if available otherwise drop back to base tool
+                cur_tool = mOverrideTool ? mOverrideTool : mBaseTool;
         }
-        else if (mCurrentTool == gToolInspect)
-        {
-                // ...can't switch out of grab
-                mOverrideTool = NULL;
-                return mCurrentTool;
-        }
-        else
+
+        //update tool selection status
+        if (mSelectedTool != cur_tool)
         {
-                // ...can switch between editing tools
-                if (override_mask == MASK_CONTROL)
-                {
-                        // Control lifts when in the pie tool, otherwise switches to rotate
-                        if (mCurrentTool == gToolPie)
-                        {
-                                mOverrideTool = gToolGrab;
-                        }
-                        else
-                        {
-                                mOverrideTool = gToolRotate;
-                        }
-                        return mOverrideTool;
-                }
-                else if (override_mask == (MASK_CONTROL | MASK_SHIFT))
+                if (mSelectedTool)
                 {
-                        // Shift-Control spins when in the pie tool, otherwise switches to scale
-                        if (mCurrentTool == gToolPie)
-                        {
-                                mOverrideTool = gToolGrab;
-                        }
-                        else
-                        {
-                                mOverrideTool = gToolStretch;
-                        }
-                        return mOverrideTool;
+                        mSelectedTool->handleDeselect();
                 }
-                else
+                if (cur_tool)
                 {
-                        mOverrideTool = NULL;
-                        return mCurrentTool;
+                        cur_tool->handleSelect();
                 }
+                mSelectedTool = cur_tool;
         }
+
+        return mSelectedTool;
+}
+
+LLTool* LLToolMgr::getBaseTool()
+{
+        return mBaseTool;
+}
+
+void LLToolMgr::updateToolStatus()
+{
+        // call getcurrenttool() to calculate active tool and call handleSelect() and handleDeselect() immediately
+        // when active tool changes
+        getCurrentTool();
 }
 
 BOOL LLToolMgr::inEdit()
 {
-        return mCurrentTool != gToolPie && mCurrentTool != gToolNull;
+        return mBaseTool != gToolPie && mBaseTool != gToolNull;
 }
 
 void LLToolMgr::setTransientTool(LLTool* tool)
@@ -411,34 +375,26 @@ void LLToolMgr::setTransientTool(LLTool* tool)
         {
                 if (mTransientTool)
                 {
-                        mTransientTool->handleDeselect();
                         mTransientTool = NULL;
                 }
-                else if (mCurrentTool)
-                {
-                        mCurrentTool->handleDeselect();
-                }
 
                 mTransientTool = tool;
-                mTransientTool->handleSelect();
         }
+
+        updateToolStatus();
 }
 
 void LLToolMgr::clearTransientTool()
 {
         if (mTransientTool)
         {
-                mTransientTool->handleDeselect();
                 mTransientTool = NULL;
-                if (mCurrentTool)
-                {
-                        mCurrentTool->handleSelect();
-                }
-                else
+                if (!mBaseTool)
                 {
-                        llwarns << "mCurrentTool is NULL" << llendl;
+                        llwarns << "mBaseTool is NULL" << llendl;
                 }
         }
+        updateToolStatus();
 }
 
 
@@ -447,26 +403,19 @@ void LLToolMgr::clearTransientTool()
 // release this locking.
 void LLToolMgr::onAppFocusLost()
 {
-        if (mCurrentTool 
-                && mCurrentTool == gToolGun)
-        {
-                mCurrentTool->handleDeselect();
-        }
-        mSavedTool = mCurrentTool;
-        mCurrentTool = gToolNull;
+        mSavedTool = mBaseTool;
+        mBaseTool = gToolNull;
+        updateToolStatus();
 }
 
 void LLToolMgr::onAppFocusGained()
 {
         if (mSavedTool)
         {
-                if (mSavedTool == gToolGun)
-                {
-                        mCurrentTool->handleSelect();
-                }
-                mCurrentTool = mSavedTool;
+                mBaseTool = mSavedTool;
                 mSavedTool = NULL;
         }
+        updateToolStatus();
 }
 
 /////////////////////////////////////////////////////
@@ -510,7 +459,10 @@ BOOL LLToolset::isToolSelected( S32 index )
 void LLToolset::selectFirstTool()
 {
         mSelectedTool = mToolList.getFirstData();
-        gToolMgr->setCurrentTool( mSelectedTool );
+        if (gToolMgr) 
+        {
+                gToolMgr->setCurrentTool( mSelectedTool );
+        }
 }
 
 
@@ -559,5 +511,5 @@ void LLToolset::selectPrevTool()
 void select_tool( void *tool_pointer )
 {
         LLTool *tool = (LLTool *)tool_pointer;
-        gCurrentToolset->selectTool( tool );
+        gToolMgr->getCurrentToolset()->selectTool( tool );
 }