1 files changed, 9 insertions, 4 deletions

diff --git a/linden/indra/newview/lltoolmgr.h b/linden/indra/newview/lltoolmgr.h
index 6f0f50b..5cf005a 100644
--- a/linden/indra/newview/lltoolmgr.h
+++ b/linden/indra/newview/lltoolmgr.h
@@ -51,27 +51,33 @@ public:
         // Must be called after gSavedSettings set up.
         void                    initTools();
 
-        LLTool*                 getCurrentTool(MASK override_mask);
+        LLTool*                 getCurrentTool(); // returns active tool, taking into account keyboard state
+        LLTool*                 getBaseTool(); // returns active tool when overrides are deactivated
 
         BOOL                    inEdit();
-        void                    useSelectedTool( LLToolset* vp );
 
         void                    setTransientTool(LLTool* tool);
         void                    clearTransientTool();
         BOOL                    usingTransientTool();
 
+        void                    setCurrentToolset(LLToolset* current);
+        LLToolset*              getCurrentToolset();
+
         void                    onAppFocusGained();
         void                    onAppFocusLost();
 
 protected:
         friend class LLToolset;  // to allow access to setCurrentTool();
         void                    setCurrentTool(LLTool* tool);
+        void                    updateToolStatus();
 
 protected:
-        LLTool*                 mCurrentTool;
+        LLTool*                 mBaseTool;
         LLTool*                 mSavedTool;             // The current tool at the time application focus was lost.
         LLTool*                 mTransientTool;
         LLTool*                 mOverrideTool; // Tool triggered by keyboard override
+        LLTool*                 mSelectedTool; // last known active tool
+        LLToolset*              mCurrentToolset;
 };
 
 // Sets of tools for various modes
@@ -106,7 +112,6 @@ void select_tool(void *tool);
 // Globals (created and destroyed by LLViewerWindow)
 extern LLToolMgr*   gToolMgr;
 
-extern LLToolset* gCurrentToolset;
 extern LLToolset* gBasicToolset;
 extern LLToolset *gCameraToolset;
 //extern LLToolset *gLandToolset;