summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmedia.h
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-13 12:59:17 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-13 12:59:17 -0800
commit2e70e4e2d7adbca52884186975623e26ab7fb9fb (patch)
tree43e212e384b4a357681dfc2ad6eb48b6f6b8c89a /indra/newview/llviewerparcelmedia.h
parentca630bf6bb1c7c8e04f5ed1e7d649d29d504a6e1 (diff)
Add functionality to nearby media floater: parcel media & autoplay
This change implements the enabling/disabling of parcel media, as well as setting the user's autoplay preference. I still am quite confused by this UI, so we'll need to play with it a bit to ensure it is what we want to present to users. This adds a few helpers to llviewerparcelmedia to get the name and URL of media.
Diffstat (limited to 'indra/newview/llviewerparcelmedia.h')
-rw-r--r--indra/newview/llviewerparcelmedia.h2
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 ** );