aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolpie.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltoolpie.h')
-rw-r--r--linden/indra/newview/lltoolpie.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/linden/indra/newview/lltoolpie.h b/linden/indra/newview/lltoolpie.h
index 9f9ccd0..f336001 100644
--- a/linden/indra/newview/lltoolpie.h
+++ b/linden/indra/newview/lltoolpie.h
@@ -60,27 +60,31 @@ public:
60 virtual LLTool* getOverrideTool(MASK mask); 60 virtual LLTool* getOverrideTool(MASK mask);
61 61
62 LLPickInfo& getPick() { return mPick; } 62 LLPickInfo& getPick() { return mPick; }
63 63 U8 getClickAction() { return mClickAction; }
64 LLViewerObject* getClickActionObject() { return mClickActionObject; }
65 LLObjectSelection* getLeftClickSelection() { return (LLObjectSelection*)mLeftClickSelection; }
66 void resetSelection();
67
64 static void leftMouseCallback(const LLPickInfo& pick_info); 68 static void leftMouseCallback(const LLPickInfo& pick_info);
65 static void rightMouseCallback(const LLPickInfo& pick_info); 69 static void rightMouseCallback(const LLPickInfo& pick_info);
66 70
67 static void selectionPropertiesReceived(); 71 static void selectionPropertiesReceived();
68 72
69 73
70protected: 74private:
71 BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); 75 BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
72 BOOL pickAndShowMenu(BOOL edit_menu); 76 BOOL pickAndShowMenu(BOOL edit_menu);
73 BOOL useClickAction(BOOL always_show, MASK mask, LLViewerObject* object, 77 BOOL useClickAction(BOOL always_show, MASK mask, LLViewerObject* object,
74 LLViewerObject* parent); 78 LLViewerObject* parent);
75 79
76protected: 80private:
77 BOOL mPieMouseButtonDown; 81 BOOL mPieMouseButtonDown;
78 BOOL mGrabMouseButtonDown; 82 BOOL mGrabMouseButtonDown;
79 BOOL mMouseOutsideSlop; // for this drag, has mouse moved outside slop region 83 BOOL mMouseOutsideSlop; // for this drag, has mouse moved outside slop region
80 LLPickInfo mPick; 84 LLPickInfo mPick;
81 static LLPointer<LLViewerObject> sClickActionObject; 85 LLPointer<LLViewerObject> mClickActionObject;
82 static U8 sClickAction; 86 U8 mClickAction;
83 static LLSafeHandle<LLObjectSelection> sLeftClickSelection; 87 LLSafeHandle<LLObjectSelection> mLeftClickSelection;
84}; 88};
85 89
86 90