From ad1a46affa3c47ba04a53a5ad625cd3e3693118f Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@gmail.com>
Date: Fri, 22 May 2020 13:16:38 -0700
Subject: [PATCH] Fix (has a TOOD) for SL-13203: Parcel media auto-play works
when turned off
---
indra/newview/llviewerparcelmedia.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 4713ed4167f..0cdd447fcd2 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -159,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();
--
GitLab