diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/lltoolcomp.h | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltoolcomp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h index 143b5b1..d75cd11 100644 --- a/linden/indra/newview/lltoolcomp.h +++ b/linden/indra/newview/lltoolcomp.h | |||
@@ -129,6 +129,8 @@ public: | |||
129 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool | 129 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool |
130 | virtual void render(); | 130 | virtual void render(); |
131 | 131 | ||
132 | virtual LLTool* getOverrideTool(MASK mask); | ||
133 | |||
132 | static void pickCallback(S32 x, S32 y, MASK mask); | 134 | static void pickCallback(S32 x, S32 y, MASK mask); |
133 | }; | 135 | }; |
134 | 136 | ||
@@ -148,8 +150,9 @@ public: | |||
148 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool | 150 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool |
149 | virtual void render(); | 151 | virtual void render(); |
150 | 152 | ||
153 | virtual LLTool* getOverrideTool(MASK mask); | ||
154 | |||
151 | static void pickCallback(S32 x, S32 y, MASK mask); | 155 | static void pickCallback(S32 x, S32 y, MASK mask); |
152 | |||
153 | }; | 156 | }; |
154 | 157 | ||
155 | 158 | ||
@@ -169,6 +172,8 @@ public: | |||
169 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); | 172 | virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); |
170 | virtual void render(); | 173 | virtual void render(); |
171 | 174 | ||
175 | virtual LLTool* getOverrideTool(MASK mask); | ||
176 | |||
172 | static void pickCallback(S32 x, S32 y, MASK mask); | 177 | static void pickCallback(S32 x, S32 y, MASK mask); |
173 | 178 | ||
174 | protected: | 179 | protected: |