summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-11-26 22:48:22 +0000
committerJosh Bell <josh@lindenlab.com>2007-11-26 22:48:22 +0000
commitecc4b297e5daa3d74c245e5e8c96cf0a03c33e5b (patch)
tree4a9b0ae545a57f34bf456dfa5823f7377d9d3271
parentfa098e1dee46a25f20a7fd158b7f2dd17433d02b (diff)
svn merge -r 74317:74381 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
-rw-r--r--indra/llui/lltexteditor.cpp2
1 files changed, 1 insertions, 1 deletions
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)
{