Merge branch 'master' into DRTVWR-483

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index b1b5275f82..0cdd447fcd 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -102,6 +102,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 			if(mMediaImpl.isNull())
 
 			{
+				play(parcel);
 				return;
 			}
 
@@ -158,6 +159,12 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
 	if (!gSavedSettings.getBOOL("AudioStreamingMedia"))
 		return;
 
+	// This test appears all over the code and really should be facotred out into a single 
+	// call that returns true/false (with option ask dialog) but that is outside of scope
+	// for this work so we'll just directly.
+	if (gSavedSettings.getS32("ParcelMediaAutoPlayEnable") == 0 )
+		return;
+
 	std::string media_url = parcel->getMediaURL();
 	std::string media_current_url = parcel->getMediaCurrentURL();
 	std::string mime_type = parcel->getMediaType();