diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/llui/llslider.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/llui/llslider.h')
| -rw-r--r-- | indra/llui/llslider.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h index 9ca51120fc..ba0fac1465 100644 --- a/indra/llui/llslider.h +++ b/indra/llui/llslider.h @@ -52,8 +52,6 @@ public: BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG const LLString& control_name = LLString::null ); - virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_SLIDER_BAR; } - virtual LLString getWidgetTag() const { return LL_SLIDER_TAG; } virtual LLXMLNodePtr getXML(bool save_children = true) const; static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory); @@ -79,7 +77,7 @@ public: virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent); + virtual BOOL handleKeyHere(KEY key, MASK mask); virtual void draw(); private: @@ -96,9 +94,9 @@ private: S32 mMouseOffset; LLRect mDragStartThumbRect; - LLImageGL* mThumbImage; - LLImageGL* mTrackImage; - LLImageGL* mTrackHighlightImage; + LLUIImage* mThumbImage; + LLUIImage* mTrackImage; + LLUIImage* mTrackHighlightImage; LLRect mThumbRect; LLColor4 mTrackColor; |