From f5b3fc596d029d3ac2f953ee94ea3ae131d00940 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 6 Oct 2010 15:34:32 -0700
Subject: Add support for debug setting to disable link highlight & follow in
 URLs that appear in XUI widgets

---
 indra/llui/llurlentry.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/llui/llurlentry.cpp')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 5680ab8bd4..13c729ace9 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -27,6 +27,7 @@
 
 #include "linden_common.h"
 #include "llurlentry.h"
+#include "lluictrl.h"
 #include "lluri.h"
 #include "llurlmatch.h"
 #include "llurlregistry.h"
@@ -146,6 +147,15 @@ void LLUrlEntryBase::callObservers(const std::string &id, const std::string &lab
 	}
 }
 
+/// is this a match for a URL that should not be hyperlinked?
+bool LLUrlEntryBase::isLinkDisabled() const
+{
+	// this allows us to have a global setting to turn off text hyperlink highlighting/action
+	bool globally_disabled = LLUI::sSettingGroups["config"]->getBOOL("DisableTextHyperlinkActions");
+
+	return mDisabledLink || globally_disabled;
+}
+
 static std::string getStringAfterToken(const std::string str, const std::string token)
 {
 	size_t pos = str.find(token);
-- 
cgit v1.2.3


From d276950c8d4d53f9d5d6497d5a4a4582c499938a Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 15 Nov 2010 17:03:52 -0800
Subject: build fixes

---
 indra/llui/llurlentry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/llurlentry.cpp')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index ebd0f912b8..13bfeb5e2d 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -174,7 +174,7 @@ bool LLUrlEntryBase::isLinkDisabled() const
 	// this allows us to have a global setting to turn off text hyperlink highlighting/action
 	bool globally_disabled = LLUI::sSettingGroups["config"]->getBOOL("DisableTextHyperlinkActions");
 
-	return mDisabledLink || globally_disabled;
+	return globally_disabled;
 }
 
 static std::string getStringAfterToken(const std::string str, const std::string token)
-- 
cgit v1.2.3