diff options
Diffstat (limited to 'indra/newview/lltoolpie.h')
| -rw-r--r-- | indra/newview/lltoolpie.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 83df03cda2..328653d2b8 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -51,6 +51,8 @@ public: virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask); virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); + virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect& sticky_rect_screen); virtual void render(); @@ -71,21 +73,23 @@ public: static void selectionPropertiesReceived(); - + static void showAvatarInspector(const LLUUID& id); private: - BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y); - BOOL pickAndShowMenu(BOOL edit_menu); - BOOL useClickAction(BOOL always_show, MASK mask, LLViewerObject* object, - LLViewerObject* parent); - + BOOL outsideSlop (S32 x, S32 y, S32 start_x, S32 start_y); + BOOL pickLeftMouseDownCallback(); + BOOL pickRightMouseDownCallback(); + BOOL useClickAction (MASK mask, LLViewerObject* object,LLViewerObject* parent); + + void showVisualContextMenuEffect(); private: - BOOL mPieMouseButtonDown; BOOL mGrabMouseButtonDown; BOOL mMouseOutsideSlop; // for this drag, has mouse moved outside slop region LLPickInfo mPick; + LLPickInfo mHoverPick; LLPointer<LLViewerObject> mClickActionObject; U8 mClickAction; LLSafeHandle<LLObjectSelection> mLeftClickSelection; + }; |