From ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Sat, 3 Oct 2009 23:40:28 +0000
Subject: 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
---
indra/llui/llurlmatch.h | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
(limited to 'indra/llui/llurlmatch.h')
diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h
index 0711e41443..7f5767923a 100644
--- a/indra/llui/llurlmatch.h
+++ b/indra/llui/llurlmatch.h
@@ -38,6 +38,7 @@
#include <string>
#include <vector>
+#include "lluicolor.h"
///
/// LLUrlMatch describes a single Url that was matched within a string by
@@ -62,27 +63,31 @@ public:
U32 getEnd() const { return mEnd; }
/// return the Url that has been matched in the input string
- const std::string &getUrl() const { return mUrl; }
+ std::string getUrl() const { return mUrl; }
/// return a label that can be used for the display of this Url
- const std::string &getLabel() const { return mLabel; }
+ std::string getLabel() const { return mLabel; }
/// return a message that could be displayed in a tooltip or status bar
- const std::string &getTooltip() const { return mTooltip; }
+ std::string getTooltip() const { return mTooltip; }
/// return the filename for an icon that can be displayed next to this Url
- 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; }
/// 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 SL location that this Url describes, or "" if none.
- const std::string &getLocation() const { return mLocation; }
+ std::string getLocation() const { return mLocation; }
/// Change the contents of this match object (used by LLUrlRegistry)
void setValues(U32 start, U32 end, const std::string &url, const std::string &label,
const std::string &tooltip, const std::string &icon,
- const std::string &menu, const std::string &location);
+ const LLUIColor& color, const std::string &menu,
+ const std::string &location);
private:
U32 mStart;
@@ -93,6 +98,7 @@ private:
std::string mIcon;
std::string mMenuName;
std::string mLocation;
+ LLUIColor mColor;
};
#endif
--
cgit v1.2.3