diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-09-29 08:26:54 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-09-29 08:26:54 -0700 |
commit | 788c5cdf978e6844663c1d3734fc5d604de5e7cb (patch) | |
tree | ee73a63306484a2bf747f7fcfa501843964a74b5 /indra/llui/lltoolbarview.h | |
parent | 71ed326f51770b215ba5dd2ac8d159c3b764c2d2 (diff) | |
parent | 6a49f2947f05963c577a1644c16a8affc779da63 (diff) |
Merge
Diffstat (limited to 'indra/llui/lltoolbarview.h')
-rw-r--r-- | indra/llui/lltoolbarview.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/lltoolbarview.h b/indra/llui/lltoolbarview.h index b19841997b..ea3422f04e 100644 --- a/indra/llui/lltoolbarview.h +++ b/indra/llui/lltoolbarview.h @@ -65,7 +65,10 @@ public: virtual ~LLToolBarView(); virtual BOOL postBuild(); virtual void draw(); - + virtual BOOL handleHover(S32 x, S32 y, MASK mask); + virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); + virtual void onMouseCaptureLost(); + void startDrag(LLToolBarButton*); // Toolbar view interface with the rest of the world // Checks if the commandId is being used somewhere in one of the toolbars bool hasCommand(const LLCommandId& commandId) const; @@ -87,6 +90,10 @@ private: LLToolBar* mToolbarLeft; LLToolBar* mToolbarRight; LLToolBar* mToolbarBottom; + bool mDragging; + LLToolBarButton* mDragButton; + S32 mMouseX; + S32 mMouseY; }; extern LLToolBarView* gToolBarView; |