* Added mModified flag and isModified() query to check it.

  (currently it is not connect to actual data)

4 files changed, 17 insertions, 1 deletions

diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index a1ea4ba18b..1320f03a25 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -99,6 +99,7 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p)
 	mSideType(p.side),
 	mWrap(p.wrap),
 	mNeedsLayout(false),
+	mModified(false),
 	mButtonPanel(NULL),
 	mCenteringStack(NULL),
 	mPadLeft(p.pad_left),
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index 709399c59f..2c66f29c16 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -178,7 +178,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;
@@ -225,6 +226,7 @@ private:
 	
 	bool							mWrap;
 	bool							mNeedsLayout;
+	bool							mModified;
 	S32								mPadLeft,
 									mPadRight,
 									mPadTop,
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index 133835aafc..bac154f435 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -471,3 +471,14 @@ void LLToolBarView::setToolBarsVisible(bool visible)
 	mToolbarLeft->getParent()->setVisible(visible);
 	mToolbarRight->getParent()->setVisible(visible);
 }
+
+bool LLToolBarView::isModified() const
+{
+	bool modified = false;
+
+	modified |= mToolbarBottom->isModified();
+	modified |= mToolbarLeft->isModified();
+	modified |= mToolbarRight->isModified();
+
+	return modified;
+}
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index 01ff137c15..8b3af43875 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -81,6 +81,8 @@ public:
 	static BOOL handleDropTool(	void* cargo_data, S32 x, S32 y, LLToolBar* toolbar);
 	static void stopDragTool();
 	void onEndDrag();
+
+	bool isModified() const;
 	
 protected:
 	friend class LLUICtrlFactory;