summaryrefslogtreecommitdiff
path: root/indra/llui/lltoolbar.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/lltoolbar.h')
-rw-r--r--indra/llui/lltoolbar.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index 72fc5630bc..8d38bc0234 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -160,7 +160,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,
@@ -182,7 +182,8 @@ public:
LLToolBarButton* createButton(const LLCommandId& id);
- bool hasButtons() { return !mButtons.empty(); }
+ bool hasButtons() const { return !mButtons.empty(); }
+ bool isModified() const { return mModified; }
protected:
friend class LLUICtrlFactory;
@@ -196,7 +197,9 @@ protected:
bool mDragAndDropTarget;
int mDragRank;
S32 mDragx,
- mDragy;
+ mDragy,
+ mDragGirth;
+ LLCommandId mDragCommand;
public:
// Methods used in loading and saving toolbar settings
@@ -229,6 +232,7 @@ private:
bool mWrap;
bool mNeedsLayout;
+ bool mModified;
S32 mPadLeft,
mPadRight,
mPadTop,