diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-13 12:59:17 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-13 12:59:17 -0800 |
| commit | 2e70e4e2d7adbca52884186975623e26ab7fb9fb (patch) | |
| tree | 43e212e384b4a357681dfc2ad6eb48b6f6b8c89a /indra/newview/llviewermedia.h | |
| parent | ca630bf6bb1c7c8e04f5ed1e7d649d29d504a6e1 (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/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 719deb28bf..639aed4b8a 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -74,6 +74,9 @@ class LLViewerMedia LOG_CLASS(LLViewerMedia); public: + // String to get/set media autoplay in gSavedSettings + static const char *AUTO_PLAY_MEDIA_SETTING; + typedef std::vector<LLViewerMediaImpl*> impl_list; // Special case early init for just web browser component |