diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-08-02 16:36:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-08-02 16:36:50 -0400 |
| commit | 5e8995220304a105d821eb3bccd8be484520174a (patch) | |
| tree | 9b4ba9044ba7f98a38865fc854914e6b9e248486 /indra/newview/llviewermedia.h | |
| parent | c339894390af70b32cef3fca258b9a19ce4aeb20 (diff) | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
merge changes for 5.1.7-release
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; |