diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-06-25 18:51:34 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-06-25 18:51:34 +0300 |
| commit | 8602c5827caf40b654e9a6fed0d345fb0eee610b (patch) | |
| tree | 67669481446184fbcb4f995b6c297b4fcc7c77bf /indra/newview/llviewermedia.cpp | |
| parent | 08fd73410e9a7ffb64acb15422fc6836230aa588 (diff) | |
MAINT-8457 FIXED "Mute" switching cancels the volume settings of Nearby Media
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 4334cbfda3..22a21c9ca3 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1555,6 +1555,7 @@ LLViewerMediaImpl::LLViewerMediaImpl( const LLUUID& texture_id, mNavigateServerRequest(false), mMediaSourceFailed(false), mRequestedVolume(1.0f), + mPreviousVolume(1.0f), mIsMuted(false), mNeedsMuteCheck(false), mPreviousMediaState(MEDIA_NONE), @@ -2082,6 +2083,20 @@ void LLViewerMediaImpl::setVolume(F32 volume) } ////////////////////////////////////////////////////////////////////////////////////////// +void LLViewerMediaImpl::setMute(bool mute) +{ + if (mute) + { + mPreviousVolume = mRequestedVolume; + setVolume(0.0); + } + else + { + setVolume(mPreviousVolume); + } +} + +////////////////////////////////////////////////////////////////////////////////////////// void LLViewerMediaImpl::updateVolume() { if(mMediaSource) |