diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-10 18:00:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-10 18:00:24 -0700 |
| commit | 1478f22857c24f4f3ecfcf7a08fdd4d5392ee3e6 (patch) | |
| tree | a36f98dea390ce75d5acd6c2737c35eca9a6ac5d /indra/newview/lltoolbarview.h | |
| parent | a07c3559b6d22ef62e8deab56780d74ac72501e1 (diff) | |
EXP-1300 : Simplify and clean up of the DaD which now doesn't duplicate the dragged tool.
Diffstat (limited to 'indra/newview/lltoolbarview.h')
| -rw-r--r-- | indra/newview/lltoolbarview.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h index a0c526ac54..6623e63f8a 100644 --- a/indra/newview/lltoolbarview.h +++ b/indra/newview/lltoolbarview.h @@ -78,6 +78,7 @@ public: static BOOL handleDragTool( S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type); static BOOL handleDropTool( void* cargo_data, S32 x, S32 y, LLToolBar* toolbar); static void stopDragTool(); + void onEndDrag(); protected: friend class LLUICtrlFactory; @@ -94,12 +95,11 @@ private: LLToolBar* mToolbarLeft; LLToolBar* mToolbarRight; LLToolBar* mToolbarBottom; - bool mDragging; - LLToolBarButton* mDragButton; - S32 mMouseX; - S32 mMouseY; - static bool sDragStarted; + LLCommandId mDragCommand; + int mDragRank; + LLToolBar* mDragToolbar; + bool mDragStarted; }; extern LLToolBarView* gToolBarView; |