diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-06 18:39:52 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-06 18:39:52 +0100 |
| commit | 46c6ead5c3fe87405a644e3167f15b9c6239ee03 (patch) | |
| tree | 4117fbb6dc9aa7bc198e4796fe2c194b4938df3f /indra/newview/llviewermedia.h | |
| parent | 7da3a1eb4f14b67c698977eb1947ce06a312d507 (diff) | |
| parent | 057d115ac3de49db0e35066975441e64111c8369 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index c52960dfcf..e2e758befb 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -216,6 +216,7 @@ public: void skipBack(F32 step_scale); void skipForward(F32 step_scale); void setVolume(F32 volume); + void setMute(bool mute); void updateVolume(); F32 getVolume(); void focus(bool focus); @@ -448,6 +449,7 @@ private: bool mNavigateServerRequest; bool mMediaSourceFailed; F32 mRequestedVolume; + F32 mPreviousVolume; bool mIsMuted; bool mNeedsMuteCheck; int mPreviousMediaState; |