From f72015980d8238ad0837365c782866a3af52f01d Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 21 Nov 2017 11:19:56 +0200
Subject: MAINT-8007 Music do not start playing after disabling

---
 indra/newview/llviewermedia.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 01b0dd0077..7c6cce5c58 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -791,6 +791,14 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
 					LLViewerAudio::getInstance()->stopInternetStreamWithAutoFade();
 				}
 			}
+            else
+            {
+                if(gAudiop && LLViewerMedia::hasParcelAudio() && gSavedSettings.getBOOL("MediaTentativeAutoPlay"))
+                {
+                    LLViewerAudio::getInstance()->startInternetStreamWithAutoFade(LLViewerMedia::getParcelAudioURL());
+                }
+            }
+
 			pimpl->setPriority(new_priority);
 
 			if(pimpl->getUsedInUI())
-- 
cgit v1.2.3