diff options
| author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-23 21:20:19 +0000 |
|---|---|---|
| committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-23 21:20:19 +0000 |
| commit | 52562e2e664c70dcd476291820ac02b893e489b8 (patch) | |
| tree | 5137f49f194a6a28f290385c38f689d77656b2e0 /indra/newview/lltoolcomp.h | |
| parent | bc39ad916e8f23ffae12184eee675aa7c1be2ca9 (diff) | |
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
Diffstat (limited to 'indra/newview/lltoolcomp.h')
| -rw-r--r-- | indra/newview/lltoolcomp.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h index 8926cd34d2..5547a6d15b 100644 --- a/indra/newview/lltoolcomp.h +++ b/indra/newview/lltoolcomp.h @@ -37,6 +37,7 @@ class LLManip; class LLToolSelectRect; class LLToolPlacer; +class LLPickInfo; class LLView; class LLTextBox; @@ -114,7 +115,7 @@ public: 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); + static void pickCallback(const LLPickInfo& pick_info); }; //----------------------------------------------------------------------- @@ -135,7 +136,7 @@ public: virtual LLTool* getOverrideTool(MASK mask); - static void pickCallback(S32 x, S32 y, MASK mask); + static void pickCallback(const LLPickInfo& pick_info); }; //----------------------------------------------------------------------- @@ -156,7 +157,7 @@ public: virtual LLTool* getOverrideTool(MASK mask); - static void pickCallback(S32 x, S32 y, MASK mask); + static void pickCallback(const LLPickInfo& pick_info); }; @@ -178,7 +179,7 @@ public: virtual LLTool* getOverrideTool(MASK mask); - static void pickCallback(S32 x, S32 y, MASK mask); + static void pickCallback(const LLPickInfo& pick_info); protected: }; @@ -197,7 +198,7 @@ public: virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - static void pickCallback(S32 x, S32 y, MASK mask); + static void pickCallback(const LLPickInfo& pick_info); protected: LLToolPlacer* mPlacer; BOOL mObjectPlacedOnMouseDown; |