diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-04-09 21:39:15 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-04-09 21:39:15 +0300 |
commit | b1bf8443b2a8340d0d873e8b6b82ba22a8019a36 (patch) | |
tree | 41ecfe400043227fef11280ecec4b1c26eda304f /indra/newview/llpanelvolumepulldown.h | |
parent | 40394752f7f757012c032746ea0de48aa3c0323c (diff) |
SL-12999 Some menus allow mouse scroll to zoom camera
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; }; |