diff options
| author | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2007-02-17 03:02:16 +0000 |
| commit | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (patch) | |
| tree | e7c0b2e22d4719123fd688e49a16b76a084c3f77 /indra/newview/lltoolcomp.h | |
| parent | 12ac04231b8d358e70c830f7958f7efbc0f7c0d1 (diff) | |
merge -r 56779:58057 /branches/selection_management
Diffstat (limited to 'indra/newview/lltoolcomp.h')
| -rw-r--r-- | indra/newview/lltoolcomp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h index c319904ee8..c348379a16 100644 --- a/indra/newview/lltoolcomp.h +++ b/indra/newview/lltoolcomp.h @@ -110,6 +110,8 @@ 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(S32 x, S32 y, MASK mask); }; @@ -129,8 +131,9 @@ 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(S32 x, S32 y, MASK mask); - }; @@ -150,6 +153,8 @@ public: virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); virtual void render(); + virtual LLTool* getOverrideTool(MASK mask); + static void pickCallback(S32 x, S32 y, MASK mask); protected: |