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/llui/lltoolbar.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/llui/lltoolbar.h')
| -rw-r--r-- | indra/llui/lltoolbar.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h index 84fa7ec0df..56bc8b9bb3 100644 --- a/indra/llui/lltoolbar.h +++ b/indra/llui/lltoolbar.h @@ -47,8 +47,8 @@ class LLToolBarButton : public LLButton public: struct Params : public LLInitParam::Block<Params, LLButton::Params> { - Optional<LLUI::RangeS32::Params> button_width; - Optional<S32> desired_height; + Optional<LLUI::RangeS32> button_width; + Optional<S32> desired_height; Params() : button_width("button_width"), @@ -161,9 +161,11 @@ public: void* cargo_data, EAcceptance* accept, std::string& tooltip_msg); + + static const int RANK_NONE = -1; - bool addCommand(const LLCommandId& commandId, int rank = -1); - bool removeCommand(const LLCommandId& commandId); + bool addCommand(const LLCommandId& commandId, int rank = RANK_NONE); + int removeCommand(const LLCommandId& commandId); // Returns the rank the removed command was at, RANK_NONE if not found bool hasCommand(const LLCommandId& commandId) const; bool enableCommand(const LLCommandId& commandId, bool enabled); @@ -184,8 +186,6 @@ protected: tool_handledrag_callback_t mHandleDragItemCallback; tool_handledrop_callback_t mHandleDropCallback; bool mDragAndDropTarget; - int mRank; - LLCommandId mDraggedCommand; public: // Methods used in loading and saving toolbar settings |