summaryrefslogtreecommitdiff
path: root/indra/newview/llpanellogin.cpp
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-02-04 00:33:13 +0000
committerLynx Linden <lynx@lindenlab.com>2010-02-04 00:33:13 +0000
commit2d9a08b5d1e74907ecd6df617e1be0c94cdd254d (patch)
tree7e8a1629c13cc8f179545c85993e723470f6cc33 /indra/newview/llpanellogin.cpp
parent6259214fac607200c26b421fc29bc37fbb7beca1 (diff)
parentfe5dc0351c810ba3c13d7c0c81adf910451e2293 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
-rw-r--r--indra/newview/llpanellogin.cpp4
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";
}