From 9b9769b76e1bbaa14c6b3bc5064e97e498c8e985 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 20 Sep 2007 17:51:27 +0000 Subject: 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 --- indra/newview/llstartup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llstartup.cpp') 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; } -- cgit v1.2.3