diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-19 19:33:30 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-05-19 19:33:30 +0100 |
| commit | 37f5e2aab38172df02dfa8875e7e8560f956cd46 (patch) | |
| tree | 9583349a031fb63e9220c6fbca93b25775e1f26b /indra/newview/llpanelpresetspulldown.h | |
| parent | a1cfa9ddb297f5bc66dd363800e69d4a7089467c (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into SL-12995
Diffstat (limited to 'indra/newview/llpanelpresetspulldown.h')
| -rw-r--r-- | indra/newview/llpanelpresetspulldown.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/indra/newview/llpanelpresetspulldown.h b/indra/newview/llpanelpresetspulldown.h index 322bf5a58f..c0d32b9b21 100644 --- a/indra/newview/llpanelpresetspulldown.h +++ b/indra/newview/llpanelpresetspulldown.h @@ -29,22 +29,13 @@ #include "linden_common.h" -#include "llpanel.h" +#include "llpanelpulldown.h" -class LLFrameTimer; -class LLPanelPresetsPulldown : public LLPanel +class LLPanelPresetsPulldown : public LLPanelPulldown { public: LLPanelPresetsPulldown(); - /*virtual*/ void draw(); - /*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask); - /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); - /*virtual*/ void onTopLost(); - /*virtual*/ void onVisibilityChange ( BOOL new_visibility ); /*virtual*/ BOOL postBuild(); void populatePanel(); @@ -53,9 +44,6 @@ class LLPanelPresetsPulldown : public LLPanel void onRowClick(const LLSD& user_data); std::list<std::string> mPresetNames; - LLFrameTimer mHoverTimer; - static const F32 sAutoCloseFadeStartTimeSec; - static const F32 sAutoCloseTotalTimeSec; LOG_CLASS(LLPanelPresetsPulldown); }; |