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/lltoolpie.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/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 4963940840..a8103f23a0 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -34,6 +34,7 @@ #include "lltool.h" #include "lluuid.h" +#include "llviewerwindow.h" // for LLPickInfo class LLViewerObject; class LLObjectSelection; @@ -58,23 +59,25 @@ public: virtual void handleDeselect(); virtual LLTool* getOverrideTool(MASK mask); - static void leftMouseCallback(S32 x, S32 y, MASK mask); - static void rightMouseCallback(S32 x, S32 y, MASK mask); + LLPickInfo& getPick() { return mPick; } + + static void leftMouseCallback(const LLPickInfo& pick_info); + static void rightMouseCallback(const LLPickInfo& pick_info); static void selectionPropertiesReceived(); + protected: BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); - BOOL pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL edit_menu); + BOOL pickAndShowMenu(BOOL edit_menu); BOOL useClickAction(BOOL always_show, MASK mask, LLViewerObject* object, LLViewerObject* parent); protected: BOOL mPieMouseButtonDown; BOOL mGrabMouseButtonDown; - BOOL mHitLand; - LLUUID mHitObjectID; BOOL mMouseOutsideSlop; // for this drag, has mouse moved outside slop region + LLPickInfo mPick; static LLPointer<LLViewerObject> sClickActionObject; static U8 sClickAction; static LLSafeHandle<LLObjectSelection> sLeftClickSelection; |