diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-12 18:01:50 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-12 18:01:50 -0700 |
| commit | aa1f0215c764fa346625ace43c467a0e0f803057 (patch) | |
| tree | a89d7fce3f3348fd83337cbad9a61fc98681194f /indra/llui/lltoolbar.h | |
| parent | 5f609becd37f0b3483892b211fa82ca72ddfa86a (diff) | |
EXP-1331 : Implement new longer caret and make it work on multi lines or columns of tools. EXP-1304 : handle only tools in DaD on toolbars
Diffstat (limited to 'indra/llui/lltoolbar.h')
| -rw-r--r-- | indra/llui/lltoolbar.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index 709399c59f..8fd509bacc 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -156,7 +156,7 @@ public: // virtuals void draw(); void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); - int getRankFromPosition(S32& x, S32& y); + int getRankFromPosition(S32 x, S32 y); BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, @@ -192,7 +192,9 @@ protected: bool mDragAndDropTarget; int mDragRank; S32 mDragx, - mDragy; + mDragy, + mDragGirth; + LLCommandId mDragCommand; public: // Methods used in loading and saving toolbar settings |