diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-09-20 17:51:27 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-09-20 17:51:27 +0000 |
| commit | 9b9769b76e1bbaa14c6b3bc5064e97e498c8e985 (patch) | |
| tree | 724d49ba34371ef25825dd2142879111f1590685 /indra/newview/llstartup.cpp | |
| parent | 2add0e15d7d50d1ca238c027f4ca7d56a8af08de (diff) | |
svn merge -r 69597:70080 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
* SL-55085 Login hangs if optional update is declined.
* SL-55123 Mac app icon missing from open source tarball
* SL-55121 Mac mouse cursors missing from open source tarball
* SL-54978 Remove duplicate code that snuck in during a patch merge
* SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update
* Release notes/version numbers
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 8767b15715..fe17664c7d 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2622,7 +2622,7 @@ void update_dialog_callback(S32 option, void *userdata) #if !LL_RELEASE_FOR_DOWNLOAD if (option == 2) { - LLStartUp::setStartupState( STATE_WORLD_INIT ); + LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT ); return; } #endif @@ -2638,7 +2638,7 @@ void update_dialog_callback(S32 option, void *userdata) } else { - LLStartUp::setStartupState( STATE_WORLD_INIT ); + LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT ); } return; } |