Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

1 files changed, 17 insertions, 0 deletions

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())