diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-05-19 10:58:29 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-05-19 10:58:29 -0600 |
| commit | 9edfdf06cc50739682458ef54c62676f5882e949 (patch) | |
| tree | bfdbc2e3d13810b953d14c9557735a0548c7daf5 /indra/newview/llpanelvolumepulldown.h | |
| parent | 4488e03a93b17a2b0f30a5081e1e267b5c1c8a06 (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' into DRTVWR-510
Merge DRTVWR-460 changes in master (v 6.4.3) into the 510 branch.
Diffstat (limited to 'indra/newview/llpanelvolumepulldown.h')
| -rw-r--r-- | indra/newview/llpanelvolumepulldown.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/indra/newview/llpanelvolumepulldown.h b/indra/newview/llpanelvolumepulldown.h index 4f23112f50..e907bb0c78 100644 --- a/indra/newview/llpanelvolumepulldown.h +++ b/indra/newview/llpanelvolumepulldown.h @@ -30,19 +30,12 @@ #include "linden_common.h" -#include "llpanel.h" +#include "llpanelpulldown.h" -class LLFrameTimer; - -class LLPanelVolumePulldown : public LLPanel +class LLPanelVolumePulldown : public LLPanelPulldown { public: LLPanelVolumePulldown(); - /*virtual*/ void draw(); - /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask); - /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); - /*virtual*/ void onTopLost(); - /*virtual*/ void onVisibilityChange ( BOOL new_visibility ); /*virtual*/ BOOL postBuild(); private: @@ -52,10 +45,6 @@ class LLPanelVolumePulldown : public LLPanel // "Streaming Music" and "Media" are unchecked. Otherwise enables it. void updateMediaAutoPlayCheckbox(LLUICtrl* ctrl); void onAdvancedButtonClick(const LLSD& user_data); - - LLFrameTimer mHoverTimer; - static const F32 sAutoCloseFadeStartTimeSec; - static const F32 sAutoCloseTotalTimeSec; }; |