From 51bbec1f78f8c1c9bdecbacd0ca3bebe333133e2 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 16 Oct 2015 11:26:02 +0200
Subject: [PATCH] BUG-10491: Don't screw the NoLink SLURL match!

---
 indra/llui/llurlregistry.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index d496f9b353..6e368e49d4 100755
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -285,7 +285,10 @@ bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LL
 		std::string url = text.substr(match_start, match_end - match_start + 1);
 
 		LLUrlEntryBase *stripped_entry = NULL;
-		if(LLStringUtil::containsNonprintable(url))
+		// <FS:Ansariel> BUG-10491: Don't screw the NoLink SLURL match!
+		//if(LLStringUtil::containsNonprintable(url))
+		if (match_entry != mUrlEntryNoLink && LLStringUtil::containsNonprintable(url))
+		// </FS:Ansariel>
 		{
 			LLStringUtil::stripNonprintable(url);