diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-01-24 14:45:55 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-01-24 14:45:55 +0200 |
| commit | d51c94424ea23cec4d8a3325727e4aed30e96c78 (patch) | |
| tree | e7f9c1a2f7cc6f770acbd09ad5eeb2faf7a24136 /indra/newview | |
| parent | d4b7c6bfd503a1c7904ce658b4c1f120689e5fd9 (diff) | |
| parent | a283e9b2e155160f0766d95875d4d6b0679e47c5 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 3 | ||||
| -rw-r--r-- | 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); |