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

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 67a75c7b0f..3f012fef76 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -34,11 +34,16 @@
 
 #include "llmediabase.h"	// for status codes
 
+class LLMediaManagerData;
 class LLUUID;
 
 class LLViewerMedia
 {
 	public:
+		// Special case early init for just web browser component
+		// so we can show login screen.  See .cpp file for details. JC
+		static void initBrowser();
+
 		static void initClass();
 		static void cleanupClass();
 
@@ -67,6 +72,10 @@ class LLViewerMedia
 		static void setMimeType(std::string mime_type);
 
 		static void updateImagesMediaStreams();
+
+	private:
+		// Fill in initialization data for LLMediaManager::initClass()
+		static void buildMediaManagerData( LLMediaManagerData* init_data );
 };
 
 #endif	// LLVIEWERMEDIA_H