EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release

1 files changed, 31 insertions, 30 deletions

diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h
index 4137c62a92..9e1ff3c151 100644
--- a/indra/newview/llstartup.h
+++ b/indra/newview/llstartup.h
@@ -22,38 +22,32 @@ extern const char* SCREEN_HOME_FILENAME;
 extern const char* SCREEN_LAST_FILENAME;
 
 enum EStartupState{
-	STATE_FIRST,
-	STATE_LOGIN_SHOW,
-	STATE_LOGIN_WAIT,
-	STATE_LOGIN_CLEANUP,
-	STATE_UPDATE_CHECK,
-	STATE_LOGIN_AUTH_INIT,
-	STATE_LOGIN_AUTHENTICATE,
-	STATE_LOGIN_NO_DATA_YET,
-	STATE_LOGIN_DOWNLOADING,
-	STATE_LOGIN_PROCESS_RESPONSE,
-	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_MISC,
-	STATE_PRECACHE,
-	STATE_WEARABLES_WAIT,
-	//STATE_INVENTORY_WAIT,
-	//STATE_TOS_AGREEMENT_START,
-	//STATE_TOS_AGREEMENT_WAIT,
-	//STATE_CRITICAL_MESSAGE_START,
-	//STATE_CRITICAL_MESSAGE_WAIT,
-	STATE_CLEANUP,
-	STATE_STARTED
+	STATE_FIRST,					// Initial startup
+	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_SEED_GRANTED_WAIT,		// Wait for seed cap grant
+	STATE_SEED_CAP_GRANTED,			// Have seed cap grant 
+	STATE_QUICKTIME_INIT,			// Initialzie QT
+	STATE_WORLD_WAIT,				// Waiting for simulator
+	STATE_AGENT_SEND,				// Connect to a region
+	STATE_AGENT_WAIT,				// Wait for region
+	STATE_INVENTORY_SEND,			// Do inventory transfer
+	STATE_MISC,						// Do more things (set bandwidth, start audio, save location, etc)
+	STATE_PRECACHE,					// Wait a bit for textures to download
+	STATE_WEARABLES_WAIT,			// Wait for clothing to download
+	STATE_CLEANUP,					// Final cleanup
+	STATE_STARTED					// Up and running in-world
 };
 
-// exorted symbol
-extern S32 gStartupState;
+// exported symbols
 extern BOOL gAgentMovementCompleted;
 extern bool gUseQuickTime;
 extern bool gQuickTimeInitialized;
@@ -65,6 +59,13 @@ public:
 	static bool canGoFullscreen();
 		// returns true if we are far enough along in startup to allow
 		// going full screen
+
+	// Always use this to set gStartupState so changes are logged
+	static void	setStartupState( S32 state );
+	static S32	getStartupState()				{ return gStartupState;		};
+
+protected:
+	static S32 gStartupState;			// Do not set directly, use LLStartup::setStartupState
 };