From 2d0dfbca99ffa442025358ece6340b894245d3b0 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Mon, 3 Oct 2011 16:37:07 -0700
Subject: * Added tooltips to the toolbar buttons.

Reviewed by Richard.
---
 indra/llui/lltoolbar.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index c62bbe4e71..c0058d534d 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -511,10 +511,13 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id)
 	LLCommand* commandp = LLCommandManager::instance().getCommand(id);
 	if (!commandp) return NULL;
 
+	std::string label = LLTrans::getString(commandp->labelRef());
+	std::string tooltip = label + "\n" + LLTrans::getString(commandp->tooltipRef());
+
 	LLToolBarButton::Params button_p;
 	button_p.name = id.name();
-	button_p.label = LLTrans::getString(commandp->labelRef());
-	button_p.tool_tip = button_p.label();
+	button_p.label = label;
+	button_p.tool_tip = tooltip;
 	button_p.image_overlay = LLUI::getUIImage(commandp->icon());
 	button_p.overwriteFrom(mButtonParams[mButtonType]);
 	LLToolBarButton* button = LLUICtrlFactory::create<LLToolBarButton>(button_p);
-- 
cgit v1.2.3


From 13165e909a5ba35df864ace97206da1242f41265 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Mon, 3 Oct 2011 17:11:09 -0700
Subject: fixed build

---
 indra/llxuixml/llinitparam.h | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index 9a6ded47ff..3dce7a939f 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -564,10 +564,6 @@ namespace LLInitParam
 	public:
 		typedef const T&							value_assignment_t;
 
-		S32 			mKeyVersion;
-		mutable S32 	mValidatedVersion;
-		mutable bool 	mValidated; // lazy validation flag
-
 		ParamValue() 
 		:	T(),
 			mKeyVersion(0),
@@ -607,6 +603,12 @@ namespace LLInitParam
 		{
 			return *this;
 		}
+
+		S32 			mKeyVersion;
+
+	protected:
+		mutable S32 	mValidatedVersion;
+		mutable bool 	mValidated; // lazy validation flag
 	};
 
 	template<typename T, typename NAME_VALUE_LOOKUP = TypeValues<T> >
@@ -1679,8 +1681,6 @@ namespace LLInitParam
 		S32 mLastParseGeneration;
 	};
 
-	
-
 	template<typename DERIVED_BLOCK,
 			typename BASE_BLOCK,
 			typename NAME_VALUE_LOOKUP>
@@ -1690,17 +1690,18 @@ namespace LLInitParam
 	:	public Param,
 		protected BatchBlock<DERIVED_BLOCK, BASE_BLOCK>
 	{
+		typedef BatchBlock<DERIVED_BLOCK, BASE_BLOCK> block_t;
 		typedef const BatchBlock<DERIVED_BLOCK, BASE_BLOCK>&	value_assignment_t;
 
 		ParamValue()
-		:	T(),
+		:	block_t(),
 			mKeyVersion(0),
 			mValidatedVersion(-1),
 			mValidated(false)
 		{}
 
 		ParamValue(value_assignment_t other)
-		:	T(other),
+		:	block_t(other),
 			mKeyVersion(0),
 			mValidatedVersion(-1),
 			mValidated(false)
@@ -1710,7 +1711,7 @@ namespace LLInitParam
 		void setValue(value_assignment_t val)
 		{
 			*this = val;
-			mLastParseGeneration = -1;
+			block_t::mLastParseGeneration = -1;
 		}
 
 		value_assignment_t getValue() const
@@ -1733,6 +1734,11 @@ namespace LLInitParam
 			return *this;
 		}
 
+		S32 			mKeyVersion;
+
+	protected:
+		mutable S32 	mValidatedVersion;
+		mutable bool 	mValidated; // lazy validation flag
 	};
 
 	template<typename T>
-- 
cgit v1.2.3