summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r--indra/newview/llviewermedia.h9
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