diff options
author | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-27 16:25:02 -0400 |
commit | d020dae7b9c156a08d1dd17eade7f36011f4d0fe (patch) | |
tree | 67b1a28222116b20c5fa7bcc1cbd86ca47a91aa7 /indra/newview/llstartup.h | |
parent | 745845f79987e4b4ab7f5728746a0eda8898930f (diff) | |
parent | 70600ea66adc816e72e91e804deebde40ed6b1bc (diff) |
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
Diffstat (limited to 'indra/newview/llstartup.h')
-rw-r--r-- | indra/newview/llstartup.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 4532c5e586..7f869d014f 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -50,11 +50,7 @@ typedef enum { STATE_LOGIN_SHOW, // Show login screen STATE_LOGIN_WAIT, // Wait for user input at login screen STATE_LOGIN_CLEANUP, // Get rid of login screen and start login - STATE_UPDATE_CHECK, // Wait for user at a dialog box (updates, term-of-service, etc) STATE_LOGIN_AUTH_INIT, // Start login to SL servers - STATE_LOGIN_AUTHENTICATE, // Do authentication voodoo - STATE_LOGIN_NO_DATA_YET, // Waiting for authentication replies to start - STATE_LOGIN_DOWNLOADING, // Waiting for authentication replies to download STATE_LOGIN_PROCESS_RESPONSE, // Check authentication reply STATE_WORLD_INIT, // Start building the world STATE_MULTIMEDIA_INIT, // Init the rest of multimedia library @@ -75,8 +71,6 @@ typedef enum { // exported symbols extern bool gAgentMovementCompleted; extern LLPointer<LLViewerTexture> gStartTexture; -extern std::string gInitialOutfit; -extern std::string gInitialOutfitGender; // "male" or "female" class LLStartUp { |