summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelprimmediacontrols.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 19:44:38 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 19:44:38 -0400
commit96467f09f2ef9eba9c8e1d721349d9cc8f3e1bbb (patch)
tree97528c1d3129feaa152aa6c8d589b4ca9e8005f9 /indra/newview/llpanelprimmediacontrols.h
parent9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff)
parent7203162071163108cbbb18f90ddb7f5d6734f8bd (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.h')
-rw-r--r--indra/newview/llpanelprimmediacontrols.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.h b/indra/newview/llpanelprimmediacontrols.h
index 6d2eb3430e..21d5236074 100644
--- a/indra/newview/llpanelprimmediacontrols.h
+++ b/indra/newview/llpanelprimmediacontrols.h
@@ -107,8 +107,10 @@ private:
void updateZoom();
void setCurrentURL();
- void onCommitSlider();
-
+
+ void onMediaPlaySliderCtrlMouseDown();
+ void onMediaPlaySliderCtrlMouseUp();
+
void onCommitVolumeUp();
void onCommitVolumeDown();
void onCommitVolumeSlider();
@@ -219,6 +221,8 @@ private:
S32 mVolumeSliderVisible;
LLNotificationPtr mActiveNotification;
+
+ F64 mMediaPlaySliderCtrlMouseDownValue;
};
#endif // LL_PANELPRIMMEDIACONTROLS_H