7 files changed, 57 insertions, 7 deletions

diff --git a/linden/indra/llwindow/llmousehandler.cpp b/linden/indra/llwindow/llmousehandler.cpp
index ae2f147..e3ea979 100644
--- a/linden/indra/llwindow/llmousehandler.cpp
+++ b/linden/indra/llwindow/llmousehandler.cpp
@@ -57,3 +57,9 @@ BOOL LLMouseHandler::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType cli
         }
         return handled;
 }
+
+BOOL LLMouseHandler::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        BOOL handled = FALSE;
+        return handled;
+}
diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index 7bd0f2e..1a4ea65 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -67,6 +67,7 @@ public:
 
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
+        virtual BOOL    handleHScrollWheel(S32 x, S32 y, S32 clicks);
         virtual BOOL    handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) = 0;
         virtual EShowToolTip getShowToolTip() { return SHOW_IF_NOT_BLOCKED; };
         virtual const std::string& getName() const = 0;
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index 53ca68d..6ac42b2 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -155,6 +155,10 @@ void LLWindowCallbacks::handleScrollWheel(LLWindow *window, S32 clicks)
 {
 }
 
+void LLWindowCallbacks::handleHScrollWheel(LLWindow *window, S32 clicks)
+{
+}
+
 void LLWindowCallbacks::handleResize(LLWindow *window, const S32 width, const S32 height)
 {
 }
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 5e93ab3..cbcfc5a 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -69,6 +69,7 @@ public:
         virtual BOOL handleActivateApp(LLWindow *window, BOOL activating);
         virtual void handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask);
         virtual void handleScrollWheel(LLWindow *window,  S32 clicks);
+        virtual void handleHScrollWheel(LLWindow *window,  S32 clicks);
         virtual void handleResize(LLWindow *window,  S32 width,  S32 height);
         virtual void handleFocus(LLWindow *window);
         virtual void handleFocusLost(LLWindow *window);
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 9cbc949..8f8f019 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2384,6 +2384,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                 HIPoint                         location = {0.0f, 0.0f};
                                 UInt32                          modifiers = 0;
                                 UInt32                          clickCount = 1;
+                                EventMouseWheelAxis     wheelAxis = kEventMouseWheelAxisX;
                                 long                            wheelDelta = 0;
                                 LLCoordScreen           inCoords;
                                 LLCoordGL                       outCoords;
@@ -2393,6 +2394,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                 GetEventParameter(event, kEventParamMouseLocation, typeHIPoint, NULL, sizeof(location), NULL, &location);
                                 GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(modifiers), NULL, &modifiers);
                                 GetEventParameter(event, kEventParamMouseWheelDelta, typeLongInteger, NULL, sizeof(wheelDelta), NULL, &wheelDelta);
+                                GetEventParameter(event, kEventParamMouseWheelAxis, typeMouseWheelAxis, NULL, sizeof(wheelAxis), NULL, &wheelAxis);
                                 GetEventParameter(event, kEventParamClickCount, typeUInt32, NULL, sizeof(clickCount), NULL, &clickCount);
 
                                 inCoords.mX = llround(location.x);
@@ -2501,14 +2503,31 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
                                 case kEventMouseWheelMoved:
                                         {
-                                                static S32  z_delta = 0;
+                                                switch (wheelAxis){
+                                                case kEventMouseWheelAxisX:
 
-                                                z_delta += wheelDelta;
+                                                        static S32  wheel_x_delta = 0;
 
-                                                if (z_delta <= -WHEEL_DELTA || WHEEL_DELTA <= z_delta)
-                                                {
-                                                        mCallbacks->handleScrollWheel(this, -z_delta / WHEEL_DELTA);
-                                                        z_delta = 0;
+                                                        wheel_x_delta += wheelDelta;
+
+                                                        if (wheel_x_delta <= -WHEEL_DELTA || WHEEL_DELTA <= wheel_x_delta)
+                                                        {
+                                                                mCallbacks->handleHScrollWheel(this, wheel_x_delta / WHEEL_DELTA);
+                                                                wheel_x_delta = 0;
+                                                        }
+                                                        break;
+                                                case kEventMouseWheelAxisY:
+
+                                                        static S32  wheel_y_delta = 0;
+
+                                                        wheel_y_delta += wheelDelta;
+
+                                                        if (wheel_y_delta <= -WHEEL_DELTA || WHEEL_DELTA <= wheel_y_delta)
+                                                        {
+                                                                mCallbacks->handleScrollWheel(this, -wheel_y_delta / WHEEL_DELTA);
+                                                                wheel_y_delta = 0;
+                                                        }
+                                                        break;
                                                 }
                                         }
                                         result = noErr;
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index ff27a4b..5828da3 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -1728,7 +1728,10 @@ void LLWindowSDL::gatherInput()
                                         mCallbacks->handleScrollWheel(this, -1);
                 else if (event.button.button == 5)  // mousewheel down...thanks to X11 for making SDL consider these "buttons".
                                         mCallbacks->handleScrollWheel(this, 1);
-
+                else if (event.button.button == 6)
+                                        mCallbacks->handleHScrollWheel(this, -1);
+                else if (event.button.button == 7)
+                                        mCallbacks->handleHScrollWheel(this, 1);
                 break;
             }
 
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 3fdef30..1a8a86c 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2259,6 +2259,22 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                                 }
                                 return 0;
                         }
+#ifdef WM_MOUSEHWHEEL
+                case WM_MOUSEHWHEEL:
+                        {
+                                window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_MOUSEHWHEEL");
+                                static short z_delta = 0;
+
+                                z_delta += HIWORD(w_param);
+
+                                if (z_delta <= -WHEEL_DELTA || WHEEL_DELTA <= z_delta)
+                                {
+                                        window_imp->mCallbacks->handleHScrollWheel(window_imp, z_delta / WHEEL_DELTA);
+                                        z_delta = 0;
+                                }
+                                return 0;
+                        }
+#endif //WM_MOUSEHWHEEL
                         /*
                         // TODO: add this after resolving _WIN32_WINNT issue
                         case WM_MOUSELEAVE: