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

Merged with default tip

Kitty Barnett 2012-03-11 02:55:14 +01:00
parent 52284b1c30 3a6fcde9a6
commit 0d61ba934c
5 changed files with 5 additions and 5 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/fslslbridge.cpp
View File

@ -101,7 +101,7 @@ private:
//
// Bridge functionality
//
FSLSLBridge :: FSLSLBridge(): LLEventTimer(1.0f),
FSLSLBridge :: FSLSLBridge(): LLEventTimer(2.0f),
mBridgeCreating(false),
mpBridge(NULL),
mIsFirstCallDone(false),

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()));

2
indra/newview/lltoolpie.cpp
View File

@ -1043,7 +1043,7 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l
{
group_title=group->getString();
if(!group_title.empty())
group_title+=" ";
group_title+="\n";
}
}

2
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
View File

@ -439,7 +439,7 @@
name="autorespond_nf_response_label"
top_pad="10"
width="450">
Automatic response to non-friends with in AUTOREPONSE TO NON-FRIENDS mode:
Automatic response to non-friends when in AUTOREPONSE TO NON-FRIENDS mode:
</text>
<text_editor
control_name="FSAutorespondNonFriendsResponse"