diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:06:16 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:06:16 -0700 |
| commit | 3596c0f7e139724f31258ffb96157146aeba77b1 (patch) | |
| tree | a6905a500bf4687a97f7f7ffbc87976f508279d9 /indra/llui/lltoolbar.h | |
| parent | 71879916428e9e15081d73696f46bb4a32877265 (diff) | |
EXP-1300 : Implemented carets for DaD. Works with small bugs but OK for demo. Still in need of some cleanup
Diffstat (limited to 'indra/llui/lltoolbar.h')
| -rw-r--r-- | indra/llui/lltoolbar.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index ca04a0e5d5..f3457028e7 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, @@ -188,6 +188,9 @@ protected: tool_handledrag_callback_t mHandleDragItemCallback; tool_handledrop_callback_t mHandleDropCallback; bool mDragAndDropTarget; + int mDragRank; + S32 mDragx, + mDragy; public: // Methods used in loading and saving toolbar settings @@ -217,7 +220,7 @@ private: LLLayoutStack* mWrapStack; LLPanel* mButtonPanel; LLToolBarEnums::SideType mSideType; - + bool mWrap; bool mNeedsLayout; S32 mPadLeft, |