1 files changed, 25 insertions, 12 deletions

diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index f38f7bf..1a9f659 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -35,18 +35,18 @@
 #include "llimagegl.h"
 
 // functions
-BOOL idle_startup();
-LLString load_password_from_disk();
+bool idle_startup();
+std::string load_password_from_disk();
 void release_start_screen();
 void login_alert_done(S32 option, void* user_data);
 
 // constants, variables,  & enumerations
-extern const char* SCREEN_HOME_FILENAME;
-extern const char* SCREEN_LAST_FILENAME;
+extern std::string SCREEN_HOME_FILENAME;
+extern std::string SCREEN_LAST_FILENAME;
 
-enum EStartupState{
+typedef enum {
         STATE_FIRST,                                    // Initial startup
-        STATE_MEDIA_INIT,               // Initialzie media library
+        STATE_BROWSER_INIT,             // Initialize web browser for login screen
         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
@@ -57,6 +57,7 @@ enum EStartupState{
         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
         STATE_SEED_GRANTED_WAIT,                // Wait for seed cap grant
         STATE_SEED_CAP_GRANTED,                 // Have seed cap grant 
         STATE_WORLD_WAIT,                               // Waiting for simulator
@@ -68,11 +69,13 @@ enum EStartupState{
         STATE_WEARABLES_WAIT,                   // Wait for clothing to download
         STATE_CLEANUP,                                  // Final cleanup
         STATE_STARTED                                   // Up and running in-world
-};
+} EStartupState;
 
 // exported symbols
-extern BOOL gAgentMovementCompleted;
+extern bool gAgentMovementCompleted;
 extern LLPointer<LLImageGL> gStartImageGL;
+extern std::string gInitialOutfit;
+extern std::string gInitialOutfitGender;        // "male" or "female"
 
 class LLStartUp
 {
@@ -82,8 +85,17 @@ public:
                 // going full screen
 
         // Always use this to set gStartupState so changes are logged
-        static void     setStartupState( S32 state );
-        static S32      getStartupState()                               { return gStartupState;         };
+        static void setStartupState( EStartupState state );
+        static EStartupState getStartupState() { return gStartupState; };
+
+        static void multimediaInit();
+                // Initialize LLViewerMedia multimedia engine.
+
+        // outfit_folder_name can be a folder anywhere in your inventory, 
+        // but the name must be a case-sensitive exact match.
+        // gender_name is either "male" or "female"
+        static void loadInitialOutfit( const std::string& outfit_folder_name,
+                                                                   const std::string& gender_name );
 
         static bool dispatchURL();
                 // if we have a SLURL or sim string ("Ahern/123/45") that started
@@ -93,8 +105,9 @@ public:
                 // *HACK: On startup, if we were passed a secondlife://app/do/foo
                 // command URL, store it for later processing.
 
-protected:
-        static S32 gStartupState;                       // Do not set directly, use LLStartup::setStartupState
+private:
+        static std::string startupStateToString(EStartupState state);
+        static EStartupState gStartupState; // Do not set directly, use LLStartup::setStartupState
 };