diff options
| author | James Cook <james@lindenlab.com> | 2008-07-18 17:50:25 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-07-18 17:50:25 +0000 |
| commit | ed386ae547c225e352c39e8d14921572ee534b0b (patch) | |
| tree | f67ff767edfc07900c0c8c16cd4439eb38d05be0 /indra/newview/llstartup.h | |
| parent | 292627c09df6085c985a189edd5df06d3ca1eb47 (diff) | |
merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
* gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
* featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
* snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)
Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry
* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
Diffstat (limited to 'indra/newview/llstartup.h')
| -rw-r--r-- | indra/newview/llstartup.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 38319c8d8a..ea568395d4 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -46,7 +46,7 @@ extern std::string SCREEN_LAST_FILENAME; enum EStartupState{ 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 @@ -87,6 +88,15 @@ public: static void setStartupState( S32 state ); static S32 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 // the viewer, dispatch it |