diff options
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index a8103f23a0..4963940840 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -34,7 +34,6 @@ #include "lltool.h" #include "lluuid.h" -#include "llviewerwindow.h" // for LLPickInfo class LLViewerObject; class LLObjectSelection; @@ -59,25 +58,23 @@ public: virtual void handleDeselect(); virtual LLTool* getOverrideTool(MASK mask); - LLPickInfo& getPick() { return mPick; } - - static void leftMouseCallback(const LLPickInfo& pick_info); - static void rightMouseCallback(const LLPickInfo& pick_info); + static void leftMouseCallback(S32 x, S32 y, MASK mask); + static void rightMouseCallback(S32 x, S32 y, MASK mask); static void selectionPropertiesReceived(); - protected: BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); - BOOL pickAndShowMenu(BOOL edit_menu); + BOOL pickAndShowMenu(S32 x, S32 y, MASK mask, 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; |