diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-14 14:44:36 -0400 |
| commit | 21bfcbde7ec6e6b3e8a92237b7c33879216c4e82 (patch) | |
| tree | 5346bb05d7f74d2f2021883ff0ee4f32bbb56f4a /indra/llui/llslider.h | |
| parent | 2da8eb43d57ae6876f9955386f604f2c56849211 (diff) | |
| parent | aff85ed92c5aad3a9445cf4ec5447cc56c44dfc0 (diff) | |
Merge changes
Diffstat (limited to 'indra/llui/llslider.h')
| -rw-r--r-- | indra/llui/llslider.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h index 088fd20d94..e2a94e4d8c 100644 --- a/indra/llui/llslider.h +++ b/indra/llui/llslider.h @@ -46,6 +46,8 @@ public: thumb_center_color; Optional<LLUIImage*> thumb_image, + thumb_image_pressed, + thumb_image_disabled, track_image, track_highlight_image; @@ -85,9 +87,11 @@ private: S32 mMouseOffset; LLRect mDragStartThumbRect; - LLUIImage* mThumbImage; - LLUIImage* mTrackImage; - LLUIImage* mTrackHighlightImage; + LLPointer<LLUIImage> mThumbImage; + LLPointer<LLUIImage> mThumbImagePressed; + LLPointer<LLUIImage> mThumbImageDisabled; + LLPointer<LLUIImage> mTrackImage; + LLPointer<LLUIImage> mTrackHighlightImage; LLRect mThumbRect; LLUIColor mTrackColor; |