Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.

Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry

1 files changed, 12 insertions, 8 deletions

diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 54053872df..afb2fdcde9 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -35,7 +35,7 @@
 #define LL_LLURLENTRY_H
 
 #include "lluuid.h"
-
+#include "lluicolor.h"
 #include <boost/signals2.hpp>
 #include <boost/regex.hpp>
 #include <string>
@@ -77,13 +77,16 @@ public:
 	virtual std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb) { return url; }
 
 	/// Return an icon that can be displayed next to Urls of this type
-	const std::string &getIcon() const { return mIcon; }
+	std::string getIcon() const { return mIcon; }
+
+	/// Return the color to render the displayed text
+	LLUIColor getColor() const { return mColor; }
 
 	/// Given a matched Url, return a tooltip string for the hyperlink
 	std::string getTooltip() const { return mTooltip; }
 
 	/// Return the name of a XUI file containing the context menu items
-	const std::string getMenuName() const { return mMenuName; }
+	std::string getMenuName() const { return mMenuName; }
 
 	/// Return the name of a SL location described by this Url, if any
 	virtual std::string getLocation(const std::string &url) const { return ""; }
@@ -102,11 +105,12 @@ protected:
 		LLUrlLabelSignal *signal;
 	} LLUrlEntryObserver;
 
-	boost::regex                                   mPattern;
-	std::string                                    mIcon;
-	std::string                                    mMenuName;
-	std::string                                    mTooltip;
-	std::multimap<std::string, LLUrlEntryObserver> mObservers;
+	boost::regex                                   	mPattern;
+	std::string                                    	mIcon;
+	std::string                                    	mMenuName;
+	std::string                                    	mTooltip;
+	LLUIColor										mColor;
+	std::multimap<std::string, LLUrlEntryObserver>	mObservers;
 };
 
 ///