aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llslider.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llui/llslider.h')
-rw-r--r--linden/indra/llui/llslider.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h
index 506a6bd..1c9d5e1 100644
--- a/linden/indra/llui/llslider.h
+++ b/linden/indra/llui/llslider.h
@@ -52,8 +52,6 @@ public:
52 BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG 52 BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG
53 const LLString& control_name = LLString::null ); 53 const LLString& control_name = LLString::null );
54 54
55 virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SLIDER_BAR; }
56 virtual LLString getWidgetTag() const { return LL_SLIDER_TAG; }
57 virtual LLXMLNodePtr getXML(bool save_children = true) const; 55 virtual LLXMLNodePtr getXML(bool save_children = true) const;
58 static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory); 56 static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
59 57
@@ -79,7 +77,7 @@ public:
79 virtual BOOL handleHover(S32 x, S32 y, MASK mask); 77 virtual BOOL handleHover(S32 x, S32 y, MASK mask);
80 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); 78 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
81 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); 79 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
82 virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent); 80 virtual BOOL handleKeyHere(KEY key, MASK mask);
83 virtual void draw(); 81 virtual void draw();
84 82
85private: 83private:
@@ -96,9 +94,9 @@ private:
96 S32 mMouseOffset; 94 S32 mMouseOffset;
97 LLRect mDragStartThumbRect; 95 LLRect mDragStartThumbRect;
98 96
99 LLImageGL* mThumbImage; 97 LLUIImage* mThumbImage;
100 LLImageGL* mTrackImage; 98 LLUIImage* mTrackImage;
101 LLImageGL* mTrackHighlightImage; 99 LLUIImage* mTrackHighlightImage;
102 100
103 LLRect mThumbRect; 101 LLRect mThumbRect;
104 LLColor4 mTrackColor; 102 LLColor4 mTrackColor;