1 files changed, 16 insertions, 5 deletions

diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index f3a2edd..7bd0f2e 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -33,9 +33,10 @@
 #ifndef LL_MOUSEHANDLER_H
 #define LL_MOUSEHANDLER_H
 
-#include "llstring.h"
+#include "linden_common.h"
+#include "llrect.h"
 
-// Abstract interface.
+// Mostly-abstract interface.
 // Intended for use via multiple inheritance. 
 // A class may have as many interfaces as it likes, but never needs to inherit one more than once.
 
@@ -49,13 +50,23 @@ public:
                 SHOW_IF_NOT_BLOCKED,
                 SHOW_ALWAYS,
         } EShowToolTip;
+        typedef enum {
+                CLICK_LEFT,
+                CLICK_MIDDLE,
+                CLICK_RIGHT,
+                CLICK_DOUBLELEFT
+        } EClickType;
+        virtual BOOL    handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down);
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask) = 0;
-        virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
-        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
-        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleMiddleMouseDown(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleMiddleMouseUp(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleRightMouseUp(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
+
+        virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
         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;