From 34246f686ea896a293afe1464bab057a3bda0a4f Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 20 Jan 2017 16:10:12 +0200
Subject: MAINT-7069 Media controls show Play icon even though media is
autoplaying
---
indra/newview/llviewermedia.cpp | 3 ++-
indra/newview/llviewermedia.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 434c8f1d8c..9f05ee61bd 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -810,8 +810,9 @@ void LLViewerMedia::updateMedia(void *dummy_arg)
sAnyMediaShowing = true;
}
- if (!pimpl->getUsedInUI() && pimpl->hasMedia() && pimpl->isMediaPlaying())
+ if (!pimpl->getUsedInUI() && pimpl->hasMedia() && (pimpl->isMediaPlaying() || !pimpl->isMediaTimeBased()))
{
+ // consider visible non-timebased media as playing
sAnyMediaPlaying = true;
}
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 5c876861c4..0212bf88bf 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -105,10 +105,11 @@ public:
// Is any media currently "showing"? Includes Parcel Media. Does not include media in the UI.
static bool isAnyMediaShowing();
+ // Shows if any media is playing, counts visible non time based media as playing. Does not include media in the UI.
static bool isAnyMediaPlaying();
// Set all media enabled or disabled, depending on val. Does not include media in the UI.
static void setAllMediaEnabled(bool val);
- // Set all media paused or playing, depending on val. Does not include media in the UI.
+ // Set all media paused(stopped for non time based) or playing, depending on val. Does not include media in the UI.
static void setAllMediaPaused(bool val);
static void updateMedia(void* dummy_arg = NULL);
--
cgit v1.2.3