summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.h
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2016-03-21 17:58:39 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2016-03-21 17:58:39 +0200
commitca1d7da5718a4ad40856fe404ce89690da984f15 (patch)
tree9a10615235fc0dab6be3cddbbc72c19eb324f976 /indra/newview/llviewerwindow.h
parent18cd32443a552e4f115d1b2913f262b385766cdf (diff)
MAINT-3171 Alt-clicking while moving mouse can move the camera significantly
Diffstat (limited to 'indra/newview/llviewerwindow.h')
-rwxr-xr-xindra/newview/llviewerwindow.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index d34e76f6f6..ad06f00234 100755
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -193,6 +193,7 @@ public:
/*virtual*/ BOOL handleMiddleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask);
/*virtual*/ LLWindowCallbacks::DragNDropResult handleDragNDrop(LLWindow *window, LLCoordGL pos, MASK mask, LLWindowCallbacks::DragNDropAction action, std::string data);
void handleMouseMove(LLWindow *window, LLCoordGL pos, MASK mask);
+ void handleMouseDragged(LLWindow *window, LLCoordGL pos, MASK mask);
/*virtual*/ void handleMouseLeave(LLWindow *window);
/*virtual*/ void handleResize(LLWindow *window, S32 x, S32 y);
/*virtual*/ void handleFocus(LLWindow *window);
@@ -463,6 +464,8 @@ private:
BOOL mMouseInWindow; // True if the mouse is over our window or if we have captured the mouse.
BOOL mFocusCycleMode;
+ BOOL mAllowMouseDragging;
+ LLFrameTimer mMouseDownTimer;
typedef std::set<LLHandle<LLView> > view_handle_set_t;
view_handle_set_t mMouseHoverViews;