From 3217ffb1f8a231052c7a16cc79c7111e40dfb723 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 2 Jun 2014 13:41:20 -0700
Subject: MAINT-4122 FIX Viewer crashes while opening Preferences

---
 indra/newview/llpanellogin.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index cb576440e5..712da7c36a 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -821,7 +821,7 @@ void LLPanelLogin::loadLoginPage()
 	LLMediaCtrl* web_browser = sInstance->getChild<LLMediaCtrl>("login_html");
 	if (web_browser->getCurrentNavUrl() != login_uri.asString())
 	{
-		llinfos << "login page loading: " << login_uri << llendl;
+		LL_INFOS() << "login page loading: " << login_uri << LL_ENDL;
 		web_browser->navigateTo( login_uri.asString(), "text/html" );
 	}
 }
@@ -1126,5 +1126,5 @@ void LLPanelLogin::onLocationSLURL()
 // static
 bool LLPanelLogin::getShowFavorites()
 {
-	return sInstance->mShowFavorites;
+	return gSavedPerAccountSettings.getBOOL("ShowFavoritesOnLogin");
 }
-- 
cgit v1.2.3