diff options
author | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
commit | a41ca2c34d291b4eebdeeb4475b512f2a8af5cb1 (patch) | |
tree | e305b00950eb562abec94ce33307b6694ca6ec98 /indra/newview/llviewermedia.h | |
parent | fd91f09e19f937cb7e2f779c4e146064415ad427 (diff) | |
parent | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff) |
merge fixes for storm-1602 up to latest viewer-development
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index aeac6ba29a..0b69b8f0c1 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -162,6 +162,8 @@ public: static LLPluginClassMedia* getSpareBrowserMediaSource(); static void setOnlyAudibleMediaTextureID(const LLUUID& texture_id); + + static LLSD getHeaders(); private: static void setOpenIDCookie(); |