diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:26:54 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-27 15:26:54 +0100 |
| commit | 9a00d545d480fef996f0c32fc49e5c37b1954b4a (patch) | |
| tree | 06d80b0575a3a2e6c825ff05e996db27251415e2 /indra/newview/llviewermedia.cpp | |
| parent | c0bd1cd4321444615ae0e22b132052f8ba24ec94 (diff) | |
| parent | f18d41d2fa76e59ccc5187777e22d4a9f628fed9 (diff) | |
Merge
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) |