From 895d45c19c9ce65246dbecabb08e07f5645565ac Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 10 Mar 2012 22:22:17 +0100 Subject: [PATCH 1/4] Increase tick timespan in bridge to avoid tick getting called too often --- indra/newview/fslslbridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index 32928361cd..c1213ecf71 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -101,7 +101,7 @@ private: // // Bridge functionality // -FSLSLBridge :: FSLSLBridge(): LLEventTimer(1.0f), +FSLSLBridge :: FSLSLBridge(): LLEventTimer(2.0f), mBridgeCreating(false), mpBridge(NULL), mIsFirstCallDone(false), From f31e268d37f5c6c77cde6ded1388d404061768ab Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 10 Mar 2012 22:30:12 +0100 Subject: [PATCH 2/4] Typo fix in privacy prefs panel --- .../newview/skins/default/xui/en/panel_preferences_privacy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index e60d4305f4..e153285c64 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -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: Date: Sun, 11 Mar 2012 01:54:06 +0100 Subject: [PATCH 3/4] Crashfix in chat console and Growl (INT-77) --- indra/llui/llconsole.cpp | 2 +- indra/newview/growlmanager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index cb4a896242..b25610cb29 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -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())); diff --git a/indra/newview/growlmanager.cpp b/indra/newview/growlmanager.cpp index ab0dd9de02..dea69b05f6 100644 --- a/indra/newview/growlmanager.cpp +++ b/indra/newview/growlmanager.cpp @@ -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())); From 3a6fcde9a6e4140a5d0ac6674d9b753c96db5659 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 11 Mar 2012 02:03:00 +0100 Subject: [PATCH 4/4] Show group title and avatar name on hovertip on separate lines (FIRE-5261) --- indra/newview/lltoolpie.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 6bd71bc85f..e98c2fb659 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -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"; } }