diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltoolcomp.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h index b7ec940..cb5e544 100644 --- a/linden/indra/newview/lltoolcomp.h +++ b/linden/indra/newview/lltoolcomp.h | |||
@@ -84,6 +84,9 @@ public: | |||
84 | { mCur->localPointToScreen(local_x, local_y, screen_x, screen_y); } | 84 | { mCur->localPointToScreen(local_x, local_y, screen_x, screen_y); } |
85 | 85 | ||
86 | BOOL isSelecting(); | 86 | BOOL isSelecting(); |
87 | |||
88 | virtual LLTool* getOverrideTool(MASK mask); | ||
89 | |||
87 | protected: | 90 | protected: |
88 | void setCurrentTool( LLTool* new_tool ); | 91 | void setCurrentTool( LLTool* new_tool ); |
89 | LLTool* getCurrentTool() { return mCur; } | 92 | LLTool* getCurrentTool() { return mCur; } |
@@ -135,8 +138,6 @@ public: | |||
135 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool | 138 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool |
136 | virtual void render(); | 139 | virtual void render(); |
137 | 140 | ||
138 | virtual LLTool* getOverrideTool(MASK mask); | ||
139 | |||
140 | static void pickCallback(const LLPickInfo& pick_info); | 141 | static void pickCallback(const LLPickInfo& pick_info); |
141 | }; | 142 | }; |
142 | 143 | ||
@@ -156,8 +157,6 @@ public: | |||
156 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool | 157 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool |
157 | virtual void render(); | 158 | virtual void render(); |
158 | 159 | ||
159 | virtual LLTool* getOverrideTool(MASK mask); | ||
160 | |||
161 | static void pickCallback(const LLPickInfo& pick_info); | 160 | static void pickCallback(const LLPickInfo& pick_info); |
162 | }; | 161 | }; |
163 | 162 | ||
@@ -178,11 +177,7 @@ public: | |||
178 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); | 177 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); |
179 | virtual void render(); | 178 | virtual void render(); |
180 | 179 | ||
181 | virtual LLTool* getOverrideTool(MASK mask); | ||
182 | |||
183 | static void pickCallback(const LLPickInfo& pick_info); | 180 | static void pickCallback(const LLPickInfo& pick_info); |
184 | |||
185 | protected: | ||
186 | }; | 181 | }; |
187 | 182 | ||
188 | //----------------------------------------------------------------------- | 183 | //----------------------------------------------------------------------- |