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/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),
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()));
 
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";
 				}
 			}
 
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:
         </text>
         <text_editor
          control_name="FSAutorespondNonFriendsResponse"