diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-06-02 13:41:20 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-06-02 13:41:20 -0700 |
| commit | 3217ffb1f8a231052c7a16cc79c7111e40dfb723 (patch) | |
| tree | f75a08e26ae2bc8f1982eeceb541ab818308e57b | |
| parent | 5f0eefdf2d6ead9e5df7476073185a530b06b9d4 (diff) | |
MAINT-4122 FIX Viewer crashes while opening Preferences
| -rwxr-xr-x | indra/newview/llpanellogin.cpp | 4 |
1 files 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"); } |