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

EXT-4237: Don't show Start Up pulldown until successful login. 

Previously any login attempt, even a failed one, would cause the Start
Up pulldown to appear. Now only a successful login will cause this to
happen. Also renamed the setting FirstRunThisInstall to the more accurate
HadFirstSuccessfulLogin (and inverted its logic).

Reviewed by Mani.
meow-7.2.2
Lynx Linden 2010-02-04 00:32:53 +00:00
parent 98a4d472be
commit fe5dc0351c
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/app_settings/settings.xml
View File

@ -2817,16 +2817,16 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>FirstRunThisInstall</key>
<key>HadFirstSuccessfulLogin</key>
<map>
<key>Comment</key>
<string>Specifies that you have not run the viewer since you installed the latest update</string>
<string>Specifies whether you have successfully logged in at least once before</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>FirstSelectedDisabledPopups</key>
<map>

2
indra/newview/llappviewer.cpp
View File

@ -2611,7 +2611,7 @@ void LLAppViewer::handleViewerCrash()
gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) LLMemory::getCurrentRSS() >> 10;
gDebugInfo["FirstLogin"] = (LLSD::Boolean) gAgent.isFirstLogin();
gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall");
gDebugInfo["HadFirstSuccessfulLogin"] = gSavedSettings.getBOOL("HadFirstSuccessfulLogin");
if(gLogoutInProgress)
{

4
indra/newview/llpanellogin.cpp
View File

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

5
indra/newview/llstartup.cpp
View File

@ -773,8 +773,6 @@ bool idle_startup()
LLPanelLogin::giveFocus();
gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input
}
else
@ -2012,6 +2010,9 @@ bool idle_startup()
LLStartUp::setStartupState( STATE_STARTED );
// Mark that we have successfully logged in at least once
gSavedSettings.setBOOL("HadFirstSuccessfulLogin", TRUE);
// Unmute audio if desired and setup volumes.
// Unmute audio if desired and setup volumes.
// This is a not-uncommon crash site, so surround it with