livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crashfix in chat console and Growl (INT-77)

Ansariel 2012-03-11 01:54:06 +01:00
parent f31e268d37
commit d8c7dfd223
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llconsole.cpp
View File

@ -342,7 +342,7 @@ void LLConsole::addConsoleLine(const LLWString& wline, const LLColor4 &color, LL
{
LLUrlMatch urlMatch;
LLWString workLine = wline;
while (LLUrlRegistry::instance().findUrl(workLine, urlMatch))
while (LLUrlRegistry::instance().findUrl(workLine, urlMatch) && !urlMatch.getUrl().empty())
{
LLWStringUtil::replaceString(newLine, utf8str_to_wstring(urlMatch.getUrl()), utf8str_to_wstring(urlMatch.getLabel()));

2
indra/newview/growlmanager.cpp
View File

@ -210,7 +210,7 @@ bool GrowlManager::onLLNotification(const LLSD& notice)
LLUrlMatch urlMatch;
LLWString newLine = utf8str_to_wstring(body);
LLWString workLine = utf8str_to_wstring(body);
while (LLUrlRegistry::instance().findUrl(workLine, urlMatch))
while (LLUrlRegistry::instance().findUrl(workLine, urlMatch) && !urlMatch.getUrl().empty())
{
LLWStringUtil::replaceString(newLine, utf8str_to_wstring(urlMatch.getUrl()), utf8str_to_wstring(urlMatch.getLabel()));