diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
commit | edf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch) | |
tree | 68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/newview/lltoolfocus.cpp | |
parent | 01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff) | |
parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) |
pull changes for Sunshine beta
Diffstat (limited to 'indra/newview/lltoolfocus.cpp')
-rw-r--r-- | indra/newview/lltoolfocus.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp index a754d8ee7e..857b0f0714 100644 --- a/indra/newview/lltoolfocus.cpp +++ b/indra/newview/lltoolfocus.cpp @@ -314,8 +314,6 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask) S32 dx = gViewerWindow->getCurrentMouseDX(); S32 dy = gViewerWindow->getCurrentMouseDY(); - BOOL moved_outside_slop = FALSE; - if (hasMouseCapture() && mValidClickPoint) { mAccumX += llabs(dx); @@ -323,19 +321,11 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask) if (mAccumX >= SLOP_RANGE) { - if (!mOutsideSlopX) - { - moved_outside_slop = TRUE; - } mOutsideSlopX = TRUE; } if (mAccumY >= SLOP_RANGE) { - if (!mOutsideSlopY) - { - moved_outside_slop = TRUE; - } mOutsideSlopY = TRUE; } } |