diff options
| author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
|---|---|---|
| committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
| commit | df4f20d4f51e41355e876f734527b4245543415c (patch) | |
| tree | 36aaf66ddb96b27fb9701764153cd7d17add275a /indra/newview/lltoolpie.h | |
| parent | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (diff) | |
merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
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; |