diff options
| author | callum <none@none> | 2011-10-11 15:34:32 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-11 15:34:32 -0700 |
| commit | 6f39beec9aa7168e6ad6f6e395f451d12b885a80 (patch) | |
| tree | c10a382b06c0a4398097f814fd6e47d6be78e3e2 /indra/llui/lltoolbar.h | |
| parent | ecdcaf149b7def0e40898ac202539376a673c7b1 (diff) | |
| parent | 682609d254fb973cfa267923b69c5e06b7efd7e1 (diff) | |
merge with head
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 d9ea0f57d3..709399c59f 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, @@ -190,6 +190,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 @@ -219,7 +222,7 @@ private: LLLayoutStack* mWrapStack; LLPanel* mButtonPanel; LLToolBarEnums::SideType mSideType; - + bool mWrap; bool mNeedsLayout; S32 mPadLeft, |