From 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 17 Jan 2007 23:02:00 +0000 Subject: merge release@56803 release-candidate@56833 --- indra/newview/lltoolcomp.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'indra/newview/lltoolcomp.h') diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h index cb1ec33f1b..c319904ee8 100644 --- a/indra/newview/lltoolcomp.h +++ b/indra/newview/lltoolcomp.h @@ -78,6 +78,22 @@ public: }; +//----------------------------------------------------------------------- +// LLToolCompTranslate + +class LLToolCompInspect : public LLToolComposite +{ +public: + LLToolCompInspect(); + virtual ~LLToolCompInspect(); + + // Overridden from LLToolComposite + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); + virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + + static void pickCallback(S32 x, S32 y, MASK mask); +}; + //----------------------------------------------------------------------- // LLToolCompTranslate @@ -88,16 +104,15 @@ public: virtual ~LLToolCompTranslate(); // 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(); static void pickCallback(S32 x, S32 y, MASK mask); }; - //----------------------------------------------------------------------- // LLToolCompScale @@ -191,6 +206,7 @@ protected: LLTool* mNull; }; +extern LLToolCompInspect *gToolInspect; extern LLToolCompTranslate *gToolTranslate; extern LLToolCompScale *gToolStretch; extern LLToolCompRotate *gToolRotate; -- cgit v1.2.3