diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llstartup.h | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llstartup.h')
-rw-r--r-- | linden/indra/newview/llstartup.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h index 872efba..f38f7bf 100644 --- a/linden/indra/newview/llstartup.h +++ b/linden/indra/newview/llstartup.h | |||
@@ -46,6 +46,7 @@ extern const char* SCREEN_LAST_FILENAME; | |||
46 | 46 | ||
47 | enum EStartupState{ | 47 | enum EStartupState{ |
48 | STATE_FIRST, // Initial startup | 48 | STATE_FIRST, // Initial startup |
49 | STATE_MEDIA_INIT, // Initialzie media library | ||
49 | STATE_LOGIN_SHOW, // Show login screen | 50 | STATE_LOGIN_SHOW, // Show login screen |
50 | STATE_LOGIN_WAIT, // Wait for user input at login screen | 51 | STATE_LOGIN_WAIT, // Wait for user input at login screen |
51 | STATE_LOGIN_CLEANUP, // Get rid of login screen and start login | 52 | STATE_LOGIN_CLEANUP, // Get rid of login screen and start login |
@@ -58,7 +59,6 @@ enum EStartupState{ | |||
58 | STATE_WORLD_INIT, // Start building the world | 59 | STATE_WORLD_INIT, // Start building the world |
59 | STATE_SEED_GRANTED_WAIT, // Wait for seed cap grant | 60 | STATE_SEED_GRANTED_WAIT, // Wait for seed cap grant |
60 | STATE_SEED_CAP_GRANTED, // Have seed cap grant | 61 | STATE_SEED_CAP_GRANTED, // Have seed cap grant |
61 | STATE_QUICKTIME_INIT, // Initialzie QT | ||
62 | STATE_WORLD_WAIT, // Waiting for simulator | 62 | STATE_WORLD_WAIT, // Waiting for simulator |
63 | STATE_AGENT_SEND, // Connect to a region | 63 | STATE_AGENT_SEND, // Connect to a region |
64 | STATE_AGENT_WAIT, // Wait for region | 64 | STATE_AGENT_WAIT, // Wait for region |
@@ -72,8 +72,6 @@ enum EStartupState{ | |||
72 | 72 | ||
73 | // exported symbols | 73 | // exported symbols |
74 | extern BOOL gAgentMovementCompleted; | 74 | extern BOOL gAgentMovementCompleted; |
75 | extern bool gUseQuickTime; | ||
76 | extern bool gQuickTimeInitialized; | ||
77 | extern LLPointer<LLImageGL> gStartImageGL; | 75 | extern LLPointer<LLImageGL> gStartImageGL; |
78 | 76 | ||
79 | class LLStartUp | 77 | class LLStartUp |