svn merge -r 74317:74381 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release

master
Josh Bell 2007-11-26 22:48:22 +00:00
parent fa098e1dee
commit ecc4b297e5
1 changed files with 1 additions and 1 deletions

View File

@ -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)
{