8 files changed, 73 insertions, 0 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index a3785e4..76b8927 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -1034,6 +1034,11 @@ BOOL LLLineEditor::handleHover(S32 x, S32 y, MASK mask)
 
         return handled;
 }
+BOOL LLLineEditor::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        mScrollHPos = llclamp(mScrollHPos + clicks * 3, 0, mText.length());
+        return TRUE;
+}
 
 
 BOOL LLLineEditor::handleMouseUp(S32 x, S32 y, MASK mask)
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index f9e0621..d217859 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -90,6 +90,7 @@ public:
         /*virtual*/ BOOL        handleMouseDown(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleHover(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleHScrollWheel(S32 x, S32 y, S32 clicks);
         /*virtual*/ BOOL        handleDoubleClick(S32 x,S32 y,MASK mask);
         /*virtual*/ BOOL        handleMiddleMouseDown(S32 x,S32 y,MASK mask);
         /*virtual*/ BOOL        handleRightMouseDown( S32 x, S32 y, MASK mask );
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index 65086d8..11e6239 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -426,6 +426,11 @@ BOOL LLScrollbar::handleScrollWheel(S32 x, S32 y, S32 clicks)
         changeLine( clicks * mStepSize, TRUE );
         return TRUE;
 }
+BOOL LLScrollbar::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        changeLine( clicks * mStepSize, TRUE );
+        return TRUE;
+}
 
 BOOL LLScrollbar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                         EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string &tooltip_msg)
diff --git a/linden/indra/llui/llscrollbar.h b/linden/indra/llui/llscrollbar.h
index 0bbf866..6969662 100644
--- a/linden/indra/llui/llscrollbar.h
+++ b/linden/indra/llui/llscrollbar.h
@@ -69,6 +69,7 @@ public:
         virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
+        virtual BOOL    handleHScrollWheel(S32 x, S32 y, S32 clicks);
         virtual BOOL    handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, 
                 EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string &tooltip_msg);
 
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index 6f037e2..8737a70 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -239,6 +239,23 @@ BOOL LLScrollableContainerView::handleScrollWheel( S32 x, S32 y, S32 clicks )
         return TRUE;
 }
 
+BOOL LLScrollableContainerView::handleHScrollWheel( S32 x, S32 y, S32 clicks )
+{
+        for( S32 i = SCROLLBAR_COUNT - 1; i >= 0; i++ )
+        {
+                // Note: tries horizontal and then vertical
+
+                // Pretend the mouse is over the scrollbar
+                if( mScrollbar[i]->handleScrollWheel( 0, 0, clicks ) )
+                {
+                        return TRUE;
+                }
+        }
+
+        // Eat scroll wheel event (to avoid scrolling nested containers?)
+        return TRUE;
+}
+
 BOOL LLScrollableContainerView::needsToScroll(S32 x, S32 y, LLScrollableContainerView::SCROLL_ORIENTATION axis) const
 {
         if(mScrollbar[axis]->getVisible())
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index 70fc908..c18a0db 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -91,6 +91,7 @@ public:
         virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
         virtual BOOL    handleKeyHere(KEY key, MASK mask);
         virtual BOOL    handleScrollWheel( S32 x, S32 y, S32 clicks );
+        virtual BOOL    handleHScrollWheel( S32 x, S32 y, S32 clicks );
         virtual BOOL    handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                    EDragAndDropType cargo_type,
                                                                    void* cargo_data,
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index d4eda8f..507c5f5 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -960,6 +960,19 @@ BOOL LLView::handleScrollWheel(S32 x, S32 y, S32 clicks)
         return handled;
 }
 
+BOOL LLView::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        BOOL handled = FALSE;
+        if( getVisible() && getEnabled() )
+        {
+                handled = childrenHandleHScrollWheel( x, y, clicks ) != NULL;
+                if( !handled && blockMouseEvent(x, y) )
+                {
+                        handled = TRUE;
+                }
+        }
+        return handled;
+}
 BOOL LLView::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
         BOOL handled = childrenHandleRightMouseDown( x, y, mask ) != NULL;
@@ -1032,6 +1045,34 @@ LLView* LLView::childrenHandleScrollWheel(S32 x, S32 y, S32 clicks)
         return handled_view;
 }
 
+LLView* LLView::childrenHandleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        LLView* handled_view = NULL;
+        if (getVisible() && getEnabled() )
+        {
+                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                {
+                        LLView* viewp = *child_it;
+                        S32 local_x = x - viewp->getRect().mLeft;
+                        S32 local_y = y - viewp->getRect().mBottom;
+                        if (viewp->pointInView(local_x, local_y)
+                                && viewp->getVisible()
+                                && viewp->getEnabled()
+                                && viewp->handleHScrollWheel( local_x, local_y, clicks ))
+                        {
+                                if (sDebugMouseHandling)
+                                {
+                                        sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
+                                }
+
+                                handled_view = viewp;
+                                break;
+                        }
+                }
+        }
+        return handled_view;
+}
+
 LLView* LLView::childrenHandleHover(S32 x, S32 y, MASK mask)
 {
         LLView* handled_view = NULL;
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 1c8ab31..9243f4f 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -473,6 +473,7 @@ public:
         /*virtual*/ BOOL        handleMiddleMouseDown(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleDoubleClick(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleScrollWheel(S32 x, S32 y, S32 clicks);
+        /*virtual*/ BOOL        handleHScrollWheel(S32 x, S32 y, S32 clicks);
         /*virtual*/ BOOL        handleRightMouseDown(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleRightMouseUp(S32 x, S32 y, MASK mask);    
         /*virtual*/ BOOL        handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect); // Display mToolTipMsg if no child handles it.
@@ -613,6 +614,7 @@ protected:
         LLView* childrenHandleMiddleMouseDown(S32 x, S32 y, MASK mask);
         LLView* childrenHandleDoubleClick(S32 x, S32 y, MASK mask);
         LLView* childrenHandleScrollWheel(S32 x, S32 y, S32 clicks);
+        LLView* childrenHandleHScrollWheel(S32 x, S32 y, S32 clicks);
         LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask);
         LLView* childrenHandleRightMouseUp(S32 x, S32 y, MASK mask);