diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-11-09 18:41:55 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-11-09 18:41:55 -0800 |
| commit | ca1356d4655223781b5e317b430c67fcb081249c (patch) | |
| tree | c15e10885a8568cd64c85054e374680992aab29d /indra/newview/llviewerparcelmedia.cpp | |
| parent | 4be7fa99e743732942a412fac5db4770d198999d (diff) | |
LLViewerMediaImpl now keeps track of which instance is the current parcel media instance.
The active parcel media instance always gets priority over other inworld media.
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index 6233a337a6..336d7f684e 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -226,6 +226,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel) media_height, media_auto_scale, media_loop); + sMediaImpl->setIsParcelMedia(true); sMediaImpl->navigateTo(media_url, mime_type, true); } } @@ -240,6 +241,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel) media_height, media_auto_scale, media_loop); + sMediaImpl->setIsParcelMedia(true); sMediaImpl->navigateTo(media_url, mime_type, true); } |