diff options
Diffstat (limited to 'linden/indra/newview/llviewermedia.h')
-rw-r--r-- | linden/indra/newview/llviewermedia.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermedia.h b/linden/indra/newview/llviewermedia.h index afda426..ee5fef4 100644 --- a/linden/indra/newview/llviewermedia.h +++ b/linden/indra/newview/llviewermedia.h | |||
@@ -79,6 +79,10 @@ class LLViewerMedia | |||
79 | static void removeMedia(LLViewerMediaImpl* media); | 79 | static void removeMedia(LLViewerMediaImpl* media); |
80 | static LLViewerMediaImpl* getMediaImplFromTextureID(const LLUUID& texture_id); | 80 | static LLViewerMediaImpl* getMediaImplFromTextureID(const LLUUID& texture_id); |
81 | static std::string getCurrentUserAgent(); | 81 | static std::string getCurrentUserAgent(); |
82 | |||
83 | // Set the proxy config for all loaded plugins | ||
84 | static void setProxyConfig(bool enable, const std::string &host, int port); | ||
85 | |||
82 | static void updateBrowserUserAgent(); | 86 | static void updateBrowserUserAgent(); |
83 | static bool handleSkinCurrentChanged(const LLSD& /*newvalue*/); | 87 | static bool handleSkinCurrentChanged(const LLSD& /*newvalue*/); |
84 | static bool textureHasMedia(const LLUUID& texture_id); | 88 | static bool textureHasMedia(const LLUUID& texture_id); |
@@ -109,6 +113,7 @@ public: | |||
109 | void createMediaSource(); | 113 | void createMediaSource(); |
110 | void destroyMediaSource(); | 114 | void destroyMediaSource(); |
111 | void setMediaType(const std::string& media_type); | 115 | void setMediaType(const std::string& media_type); |
116 | static void setProxy(LLPluginClassMedia* media_source); | ||
112 | bool initializeMedia(const std::string& mime_type); | 117 | bool initializeMedia(const std::string& mime_type); |
113 | bool initializePlugin(const std::string& media_type); | 118 | bool initializePlugin(const std::string& media_type); |
114 | LLPluginClassMedia* getMediaPlugin() { return mMediaSource; } | 119 | LLPluginClassMedia* getMediaPlugin() { return mMediaSource; } |