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

MAINT-4122 FIX Viewer crashes while opening Preferences

meow-7.2.2
Callum Prentice 2014-06-02 13:41:20 -07:00
parent 5f0eefdf2d
commit 3217ffb1f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llpanellogin.cpp
View File

@ -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");
}