diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:51:16 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:51:16 -0800 |
commit | 598450785b9d0cfd1254e39a68fe8f5c889ac509 (patch) | |
tree | 9145aef1e6e4b69386d313f427bc637630991848 /indra/newview/llviewermedia.h | |
parent | 36954908632d6f5366f6517023676c1bcd71aa17 (diff) | |
parent | adb62e958ff3a4be2eb43fbb1754358ec60a118c (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 4025a4484f..6f8d12e676 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -155,6 +155,9 @@ public: static void proxyWindowOpened(const std::string &target, const std::string &uuid); static void proxyWindowClosed(const std::string &uuid); + static void createSpareBrowserMediaSource(); + static LLPluginClassMedia* getSpareBrowserMediaSource(); + private: static void setOpenIDCookie(); static void onTeleportFinished(); @@ -162,6 +165,7 @@ private: static LLPluginCookieStore *sCookieStore; static LLURL sOpenIDURL; static std::string sOpenIDCookie; + static LLPluginClassMedia* sSpareBrowserMediaSource; }; // Implementation functions not exported into header file |