diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-03 19:47:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-03 19:47:24 -0500 |
| commit | fae0d9c309c33f853a8579080cbf1ddbd849e1ef (patch) | |
| tree | 57128bf19621cad415103d25759105dbca67a461 /indra/newview/llpanellogin.cpp | |
| parent | d49e5bcbe26a4b148ce1d20a60d16581f41134c0 (diff) | |
| parent | c788986c9ed282f5e8afc8b5352e61986cdbc209 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
| -rw-r--r-- | 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 af9e791223..df9002facc 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -676,7 +676,7 @@ void LLPanelLogin::refreshLocation( bool force_visible ) // Don't show on first run after install // Otherwise ShowStartLocation defaults to true. show_start = gSavedSettings.getBOOL("ShowStartLocation") - && !gSavedSettings.getBOOL("FirstRunThisInstall"); + && gSavedSettings.getBOOL("HadFirstSuccessfulLogin"); } sInstance->childSetVisible("start_location_combo", show_start); @@ -847,7 +847,7 @@ void LLPanelLogin::loadLoginPage() oStr << "&auto_login=TRUE"; } if (gSavedSettings.getBOOL("ShowStartLocation") - && !gSavedSettings.getBOOL("FirstRunThisInstall")) + && gSavedSettings.getBOOL("HadFirstSuccessfulLogin")) { oStr << "&show_start_location=TRUE"; } |