From ca1356d4655223781b5e317b430c67fcb081249c Mon Sep 17 00:00:00 2001
From: Monroe Linden <monroe@lindenlab.com>
Date: Mon, 9 Nov 2009 18:41:55 -0800
Subject: 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.
---
 indra/newview/llviewerparcelmedia.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llviewerparcelmedia.cpp')

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);
 	}
 
-- 
cgit v1.2.3