1 files changed, 15 insertions, 20 deletions

diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index 81ed0ba..cb5e544 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -84,6 +84,9 @@ public:
                                                                 { mCur->localPointToScreen(local_x, local_y, screen_x, screen_y); }
 
         BOOL                                    isSelecting();
+
+        virtual LLTool*                 getOverrideTool(MASK mask);
+
 protected:
         void                                    setCurrentTool( LLTool* new_tool );
         LLTool*                                 getCurrentTool()                                                                { return mCur; }
@@ -113,8 +116,8 @@ public:
         virtual ~LLToolCompInspect();
 
         // Overridden from LLToolComposite
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
 
         static void pickCallback(const LLPickInfo& pick_info);
 };
@@ -135,8 +138,6 @@ public:
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);                 // Returns to the default tool
         virtual void            render();
 
-        virtual LLTool*         getOverrideTool(MASK mask);
-
         static void pickCallback(const LLPickInfo& pick_info);
 };
 
@@ -150,14 +151,12 @@ public:
         virtual ~LLToolCompScale();
 
         // Overridden from LLToolComposite
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleHover(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);                 // Returns to the default tool
         virtual void            render();
 
-        virtual LLTool*         getOverrideTool(MASK mask);
-        
         static void pickCallback(const LLPickInfo& pick_info);
 };
 
@@ -172,17 +171,13 @@ public:
         virtual ~LLToolCompRotate();
 
         // Overridden from LLToolComposite
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleHover(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);
         virtual void            render();
 
-        virtual LLTool*         getOverrideTool(MASK mask);
-
         static void pickCallback(const LLPickInfo& pick_info);
-
-protected:
 };
 
 //-----------------------------------------------------------------------
@@ -195,14 +190,14 @@ public:
         virtual ~LLToolCompCreate();
 
         // Overridden from LLToolComposite
-    virtual BOOL                handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL                handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL            handleDoubleClick(S32 x, S32 y, MASK mask);
         virtual BOOL            handleMouseUp(S32 x, S32 y, MASK mask);
         
         static void pickCallback(const LLPickInfo& pick_info);
 protected:
         LLToolPlacer*           mPlacer;
-        BOOL                            mObjectPlacedOnMouseDown;
+        BOOL                    mObjectPlacedOnMouseDown;
 };
 
 
@@ -220,7 +215,7 @@ public:
         virtual ~LLToolCompGun();
 
         // Overridden from LLToolComposite
-    virtual BOOL                        handleHover(S32 x, S32 y, MASK mask);
+        virtual BOOL                    handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL                    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL                    handleDoubleClick(S32 x, S32 y, MASK mask);
         virtual BOOL                    handleRightMouseDown(S32 x, S32 y, MASK mask);