3 files changed, 15 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index cbcc174..4d13196 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -145,6 +145,14 @@
           modified:   linden/indra/newview/viewer_manifest.py
 
 
+2010-01-05  Armin Weatherwax  <Armin.Weatherwax@gmail.com>
+
+        * Slider widgets can now be controlled with mouse wheel.
+
+          modified:   linden/indra/llui/llslider.cpp
+          modified:   linden/indra/llui/llslider.h
+
+
 2010-01-08 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Fixed options missing from Text Chat and Input & Camera preferences (see VWR-13120).
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 7b4da9b..83b4d65 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -222,6 +222,12 @@ BOOL LLSlider::handleMouseDown(S32 x, S32 y, MASK mask)
         return TRUE;
 }
 
+BOOL LLSlider::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        setValueAndCommit(getValueF32() - ( getIncrement()* (F32)clicks ));
+        return TRUE;
+}
+
 BOOL LLSlider::handleKeyHere(KEY key, MASK mask)
 {
         BOOL handled = FALSE;
diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h
index 154685f..9fc85f2 100644
--- a/linden/indra/llui/llslider.h
+++ b/linden/indra/llui/llslider.h
@@ -78,6 +78,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    handleScrollWheel(S32 x, S32 y, S32 clicks);
         virtual BOOL    handleKeyHere(KEY key, MASK mask);
         virtual void    draw();