From 427191118e65605e03a5369bdebf2c998e54f851 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 19 Jan 2015 17:52:06 +0200
Subject: MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey
 part of the link always appears.

---
 indra/llui/lltextbase.cpp               |  3 +--
 indra/llui/llurlentry.cpp               |  8 ++------
 indra/llui/llurlentry.h                 |  1 -
 indra/newview/app_settings/settings.xml | 11 -----------
 4 files changed, 3 insertions(+), 20 deletions(-)

(limited to 'indra')

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 3193300ebb..103c5b6047 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2065,8 +2065,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
 			// output the styled Url
 			appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly());
 
-			// show query part of url with gray color if enabled in global settings in "ShowGreyQueryInUrls"
-			// and only for LLUrlEntryHTTP and LLUrlEntryHTTPNoProtocol url entries
+			// show query part of url with gray color only for LLUrlEntryHTTP and LLUrlEntryHTTPNoProtocol url entries
 			std::string label = match.getQuery();
 			if (label.size())
 			{
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index acc8fdacfb..e18d7405ab 100755
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -49,7 +49,6 @@ std::string localize_slapp_label(const std::string& url, const std::string& full
 
 LLUrlEntryBase::LLUrlEntryBase()
 {
-	mGreyQuery = LLUI::sSettingGroups["config"]->getBOOL("ShowGreyQueryInUrls");
 }
 
 LLUrlEntryBase::~LLUrlEntryBase()
@@ -206,11 +205,8 @@ std::string LLUrlEntryBase::urlToGreyQuery(const std::string &url) const
 	LLUriParser up(unescapeUrl(url));
 
 	std::string query;
-	if (mGreyQuery)
-	{
-		up.extractParts();
-		up.glueSecond(query);
-	}
+	up.extractParts();
+	up.glueSecond(query);
 
 	return query;
 }
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 57e374f5bd..ddfc33ab78 100755
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -130,7 +130,6 @@ protected:
 	std::string                                    	mMenuName;
 	std::string                                    	mTooltip;
 	std::multimap<std::string, LLUrlEntryObserver>	mObservers;
-	bool											mGreyQuery;
 };
 
 ///
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 269b357b80..9f3fc26c90 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -15607,17 +15607,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ShowGreyQueryInUrls</key>
-    <map>
-        <key>Comment</key>
-        <string>Enable(disable) appearance of port, query and fragment parts of url for HTTP and HTTPNoProtocol entries in grey.</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>Boolean</string>
-        <key>Value</key>
-        <integer>1</integer>
-    </map>
 </map>
 </llsd>
 
-- 
cgit v1.2.3