diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-13 15:11:10 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-13 15:11:10 -0800 |
| commit | 4ca8b32bceab308411c9ea13552338e9cccd70f4 (patch) | |
| tree | e5ae240f581ff7d70a1bef79f0f1553e49cb74e3 /indra/newview/llviewerparcelmedia.h | |
| parent | 6cb4b27897462582428e9d469feb6bf8c9335b06 (diff) | |
| parent | a4addf39e5293e008b534c9c1cfcad14956afe1a (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
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 ** ); |