svn merge -r 74317:74381 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release
parent
fa098e1dee
commit
ecc4b297e5
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue