Merge from viewer2 trunk.

1 files changed, 49 insertions, 10 deletions

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 17aecaf32f..8abbc833e5 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -244,7 +244,8 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 
 LLTextBase::~LLTextBase()
 {
-	delete mPopupMenu;
+	// Menu, like any other LLUICtrl, is deleted by its parent - gMenuHolder
+
 	clearSegments();
 }
 
@@ -1009,6 +1010,16 @@ void LLTextBase::draw()
 void LLTextBase::setColor( const LLColor4& c )
 {
 	mFgColor = c;
+	//textsegments have own style property , 
+	//so we have to update it also to apply changes, EXT-4433
+	for(segment_set_t::iterator it = mSegments.begin(); it != mSegments.end(); it++)
+	{
+		LLTextSegment* segment = it->get(); 
+		if(segment)
+		{
+			segment->setColor(mFgColor);
+		}
+	}
 }
 
 //virtual 
@@ -1501,6 +1512,25 @@ void LLTextBase::setText(const LLStringExplicit &utf8str, const LLStyle::Params&
 	onValueChange(0, getLength());
 }
 
+void LLTextBase::addBlackListUrl(const std::string &url)
+{
+	mBlackListUrls.push_back(url);
+}
+
+bool LLTextBase::isBlackListUrl(const std::string &url) const
+{
+	std::vector<std::string>::const_iterator it;
+	for (it = mBlackListUrls.begin(); it != mBlackListUrls.end(); ++it)
+	{
+		const std::string &blacklist_url = *it;
+		if (url.find(blacklist_url) != std::string::npos)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
 //virtual
 std::string LLTextBase::getText() const
 {
@@ -1575,20 +1605,29 @@ void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, c
 					prepend_newline = false;
 				}
 			}
-			// output the styled Url
-			appendAndHighlightText(match.getLabel(), prepend_newline, part, link_params);
-			prepend_newline = false;
 
-			// set the tooltip for the Url label
-			if (! match.getTooltip().empty())
+			// output the styled Url (unless we've been asked to suppress it)
+			if (isBlackListUrl(match.getUrl()))
 			{
-				segment_set_t::iterator it = getSegIterContaining(getLength()-1);
-				if (it != mSegments.end())
+				std::string orig_url = text.substr(start, end-start);
+				appendAndHighlightText(orig_url, prepend_newline, part, style_params);
+			}
+			else
+			{
+				appendAndHighlightText(match.getLabel(), prepend_newline, part, link_params);
+
+				// set the tooltip for the Url label
+				if (! match.getTooltip().empty())
 				{
-					LLTextSegmentPtr segment = *it;
-					segment->setToolTip(match.getTooltip());
+					segment_set_t::iterator it = getSegIterContaining(getLength()-1);
+					if (it != mSegments.end())
+						{
+							LLTextSegmentPtr segment = *it;
+							segment->setToolTip(match.getTooltip());
+						}
 				}
 			}
+			prepend_newline = false;
 
 			// move on to the rest of the text after the Url
 			if (end < (S32)text.length())