diff options
Diffstat (limited to 'linden/indra/newview/llviewermedia.h')
-rw-r--r-- | linden/indra/newview/llviewermedia.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermedia.h b/linden/indra/newview/llviewermedia.h index a335117..2a78585 100644 --- a/linden/indra/newview/llviewermedia.h +++ b/linden/indra/newview/llviewermedia.h | |||
@@ -34,11 +34,16 @@ | |||
34 | 34 | ||
35 | #include "llmediabase.h" // for status codes | 35 | #include "llmediabase.h" // for status codes |
36 | 36 | ||
37 | class LLMediaManagerData; | ||
37 | class LLUUID; | 38 | class LLUUID; |
38 | 39 | ||
39 | class LLViewerMedia | 40 | class LLViewerMedia |
40 | { | 41 | { |
41 | public: | 42 | public: |
43 | // Special case early init for just web browser component | ||
44 | // so we can show login screen. See .cpp file for details. JC | ||
45 | static void initBrowser(); | ||
46 | |||
42 | static void initClass(); | 47 | static void initClass(); |
43 | static void cleanupClass(); | 48 | static void cleanupClass(); |
44 | 49 | ||
@@ -67,6 +72,10 @@ class LLViewerMedia | |||
67 | static void setMimeType(std::string mime_type); | 72 | static void setMimeType(std::string mime_type); |
68 | 73 | ||
69 | static void updateImagesMediaStreams(); | 74 | static void updateImagesMediaStreams(); |
75 | |||
76 | private: | ||
77 | // Fill in initialization data for LLMediaManager::initClass() | ||
78 | static void buildMediaManagerData( LLMediaManagerData* init_data ); | ||
70 | }; | 79 | }; |
71 | 80 | ||
72 | #endif // LLVIEWERMEDIA_H | 81 | #endif // LLVIEWERMEDIA_H |