diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-16 16:28:04 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-16 16:28:04 +0200 |
commit | eef22e0baf9e62f8c38058ad22e6e6bd5e5aca26 (patch) | |
tree | 2a498eb73a80802c7811193ce63253c9be905295 /indra/newview/llviewerparcelmedia.h | |
parent | 59d575fe615bf14a10056c9b9fe0c109ec2c103e (diff) | |
parent | bd42c1ae2cd6bb6e005478cc121c2b5d7a844eb4 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerparcelmedia.h')
-rw-r--r-- | indra/newview/llviewerparcelmedia.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h index 3f7f898356..19e1ef78d4 100644 --- a/indra/newview/llviewerparcelmedia.h +++ b/indra/newview/llviewerparcelmedia.h @@ -71,6 +71,8 @@ class LLViewerParcelMedia : public LLViewerMediaObserver static LLPluginClassMediaOwner::EMediaStatus getStatus(); static std::string getMimeType(); + static std::string getURL(); + static std::string getName(); static viewer_media_t getParcelMedia(); static void processParcelMediaCommandMessage( LLMessageSystem *msg, void ** ); |