Merge remote-tracking branch 'origin/next' into WL-refactor

1 files changed, 0 insertions, 10 deletions

diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index ae0cd1e..c0dedb6 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -318,8 +318,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);
@@ -327,19 +325,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;
                 }
         }