From ecc4b297e5daa3d74c245e5e8c96cf0a03c33e5b Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 26 Nov 2007 22:48:22 +0000
Subject: svn merge -r 74317:74381
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer -->
 release

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

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

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index fa1181a866..d08997c3ed 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -4196,7 +4196,7 @@ BOOL LLTextEditor::findHTML(const LLString &line, S32 *begin, S32 *end)
 		m2 = line.substr(*begin,(m1 - *begin)).find("http");
 		m3 = line.substr(*begin,(m1 - *begin)).find("secondlife");
 	
-		LLString badneighbors=".,<>/?';\"][}{=-+_)(*&^%$#@!~`\t\r\n\\";
+		LLString badneighbors=".,<>?';\"][}{=-+_)(*&^%$#@!~`\t\r\n\\";
 	
 		if (m2 >= 0 || m3>=0)
 		{
-- 
cgit v1.2.3