summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2017-01-20 16:10:12 +0200
committerandreykproductengine <akleshchev@productengine.com>2017-01-20 16:10:12 +0200
commit34246f686ea896a293afe1464bab057a3bda0a4f (patch)
tree9ecad459ae960da8253613a5f8a461029f00d104 /indra/newview/llviewermedia.cpp
parent178e11972491206e496a8b6bbd971474dbdc0812 (diff)
MAINT-7069 Media controls show Play icon even though media is autoplaying
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp3
1 files changed, 2 insertions, 1 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;
}