diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-13 18:23:38 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-13 18:23:38 +0200 |
| commit | 7fbb3f69b1b166954eed0a3be24f7ecb021f0b5a (patch) | |
| tree | d0dfd2f64945cd50a253c97cb33ac9360ed81223 /indra/newview/llviewermedia.cpp | |
| parent | bde862084d76eb4b9d773e10fdde6bfd3df57f7a (diff) | |
| parent | 8d34a4f8c12d624deb72878d7a6682e306f71d1a (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index ec06cc432f..bf98650afd 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -810,7 +810,7 @@ void LLViewerMedia::updateMedia(void *dummy_arg) sAnyMediaShowing = true; } - if (!pimpl->getUsedInUI() && pimpl->hasMedia() && (!pimpl->isMediaPaused() || !pimpl->isMediaTimeBased())) + if (!pimpl->getUsedInUI() && pimpl->hasMedia() && pimpl->isMediaPlaying()) { sAnyMediaPlaying = true; } @@ -949,7 +949,6 @@ void LLViewerMedia::setAllMediaPaused(bool val) if (pimpl->isMediaTimeBased() && pimpl->isMediaPaused()) { pimpl->play(); - return; } } else if (pimpl->isMediaTimeBased() && pimpl->mMediaSource) |