summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-08-03 16:19:47 -0700
committerRider Linden <rider@lindenlab.com>2018-08-03 16:19:47 -0700
commit56c773b3bc52d72a5a7056d6eb9ce014dedbc0d8 (patch)
treee9c39e4c9255a909ce0996b4cf228d562020fddb /indra/newview/llviewermedia.h
parent8779b29487dd3d18220b17be8dd501ffeabe274f (diff)
parent09f97172bb478a2c977d8b7b0958196e7e98c433 (diff)
Merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r--indra/newview/llviewermedia.h2
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;