1 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 79828f1..74edd2e 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -49,6 +49,7 @@
 #include "llstat.h"
 #include "llalertdialog.h"
 #include "llnotifications.h"
+#include "llmousehandler.h"
 
 class LLView;
 class LLViewerObject;
@@ -59,7 +60,6 @@ class LLVelocityBar;
 class LLTextBox;
 class LLImageRaw;
 class LLHUDIcon;
-class LLMouseHandler;
 
 #define PICK_HALF_WIDTH 5
 #define PICK_DIAMETER (2 * PICK_HALF_WIDTH + 1)
@@ -83,7 +83,7 @@ public:
 
         static bool isFlora(LLViewerObject* object);
 
-        typedef enum e_pick_type
+        typedef enum
         {
                 PICK_OBJECT,
                 PICK_FLORA,
@@ -152,6 +152,7 @@ public:
         /*virtual*/ BOOL handleTranslatedKeyUp(KEY key,  MASK mask);
         /*virtual*/ void handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level);
         /*virtual*/ BOOL handleUnicodeChar(llwchar uni_char, MASK mask);        // NOT going to handle extended 
+        /*virtual*/ BOOL handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down);
         /*virtual*/ BOOL handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
         /*virtual*/ BOOL handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
         /*virtual*/ BOOL handleCloseRequest(LLWindow *window);
@@ -214,6 +215,7 @@ public:
         LLCoordGL               getCurrentMouseDelta()  const   { return mCurrentMouseDelta; }
         LLStat *                getMouseVelocityStat()          { return &mMouseVelocityStat; }
         BOOL                    getLeftMouseDown()      const   { return mLeftMouseDown; }
+        BOOL                    getMiddleMouseDown()    const   { return mMiddleMouseDown; }
         BOOL                    getRightMouseDown()     const   { return mRightMouseDown; }
 
         const LLPickInfo&       getLastPick() const { return mLastPick; }
@@ -281,7 +283,7 @@ public:
 
         // snapshot functionality.
         // perhaps some of this should move to llfloatershapshot?  -MG
-        typedef enum e_snapshot_type
+        typedef enum
         {
                 SNAPSHOT_TYPE_COLOR,
                 SNAPSHOT_TYPE_DEPTH,
@@ -390,6 +392,7 @@ protected:
         LLCoordGL               mCurrentMouseDelta;             //amount mouse moved this frame
         LLStat                  mMouseVelocityStat;
         BOOL                    mLeftMouseDown;
+        BOOL                    mMiddleMouseDown;
         BOOL                    mRightMouseDown;
 
         LLProgressView  *mProgressView;