diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-07-11 21:29:02 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-07-11 21:29:02 +0000 |
| commit | 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 (patch) | |
| tree | f89014544fc276b283a36eb2e0cb52e93806a44a /indra/newview/llstartup.h | |
| parent | a6769f262ff910949a7e1c81cf98e52ddfc2d44a (diff) | |
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
Diffstat (limited to 'indra/newview/llstartup.h')
| -rw-r--r-- | indra/newview/llstartup.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 75a525f241..4137c62a92 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -26,27 +26,20 @@ enum EStartupState{ STATE_LOGIN_SHOW, STATE_LOGIN_WAIT, STATE_LOGIN_CLEANUP, - STATE_RESOLVING_USERSERVER, - STATE_USERSERVER_RESOLVED, - STATE_MESSAGE_TEMPLATE_SEND, - STATE_MESSAGE_TEMPLATE_WAIT, STATE_UPDATE_CHECK, STATE_LOGIN_AUTH_INIT, STATE_LOGIN_AUTHENTICATE, STATE_LOGIN_NO_DATA_YET, STATE_LOGIN_DOWNLOADING, STATE_LOGIN_PROCESS_RESPONSE, - //STATE_USERSERVER_SEND, - //STATE_USERSERVER_WAIT, - //STATE_LOCATION_SEND, - //STATE_LOCATION_WAIT, STATE_WORLD_INIT, + STATE_SEED_GRANTED_WAIT, + STATE_SEED_CAP_GRANTED, STATE_QUICKTIME_INIT, STATE_WORLD_WAIT, STATE_AGENT_SEND, STATE_AGENT_WAIT, STATE_INVENTORY_SEND, - STATE_CONNECT_USERSERVER, STATE_MISC, STATE_PRECACHE, STATE_WEARABLES_WAIT, |