From 2ec69d6d71e18c60a81d55f79e291e366d05eacd Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Fri, 29 Jan 2010 14:56:39 +0000
Subject: EXT-4678: Revert URL black list support from LLTextBase.

The new <nolink>URL</nolink> provides a more flexible solution that
can be specified in XUI (as we now do to disabled hyperlinking for the
sim hostname in the About floater).
---
 indra/llui/lltextbase.cpp | 19 -------------------
 indra/llui/lltextbase.h   |  7 -------
 2 files changed, 26 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 2ee2023875..978bd317e2 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1512,25 +1512,6 @@ 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
 {
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index e1c6cc36ab..dc3671eab1 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -187,9 +187,6 @@ public:
 	const LLFontGL*			getDefaultFont() const					{ return mDefaultFont; }
 	LLStyle::Params			getDefaultStyle();
 
-	// tell the text object to suppress auto highlighting of a specific URL
-	void                    addBlackListUrl(const std::string &url);
-
 public:
 	// Fired when a URL link is clicked
 	commit_signal_t mURLClickSignal;
@@ -312,7 +309,6 @@ protected:
 	void							updateRects();
 	void							needsScroll() { mScrollNeeded = TRUE; }
 	void							replaceUrlLabel(const std::string &url, const std::string &label);
-	bool                            isBlackListUrl(const std::string &url) const;
 
 protected:
 	// text segmentation and flow
@@ -364,9 +360,6 @@ protected:
 	LLView*						mDocumentView;
 	class LLScrollContainer*	mScroller;
 
-	// list of URLs to suppress from automatic hyperlinking
-	std::vector<std::string>    mBlackListUrls;
-
 	// transient state
 	bool						mReflowNeeded;		// need to reflow text because of change to text contents or display region
 	bool						mScrollNeeded;		// need to change scroll region because of change to cursor position
-- 
cgit v1.2.3