diff options
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llmaniptranslate.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp index aada658..cc14b27 100644 --- a/linden/indra/newview/llmaniptranslate.cpp +++ b/linden/indra/newview/llmaniptranslate.cpp | |||
| @@ -529,16 +529,13 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask) | |||
| 529 | relative_move -= mDragCursorStartGlobal; | 529 | relative_move -= mDragCursorStartGlobal; |
| 530 | 530 | ||
| 531 | // You can't move more than some distance from your original mousedown point. | 531 | // You can't move more than some distance from your original mousedown point. |
| 532 | if (gSavedSettings.getBOOL("LimitDragDistance")) | 532 | F32 max_drag_distance = gHippoLimits->getMaxDragDistance(); |
| 533 | { | ||
| 534 | F32 max_drag_distance = gSavedSettings.getF32("MaxDragDistance"); | ||
| 535 | 533 | ||
| 536 | if(max_drag_distance < gHippoLimits->getMaxDragDistance()) max_drag_distance = gHippoLimits->getMaxDragDistance(); //Take the more restrictive if (relative_move.magVecSquared() > max_drag_distance * max_drag_distance) | 534 | if (max_drag_distance != FLT_MAX && relative_move.magVecSquared() > max_drag_distance * max_drag_distance) |
| 537 | { | 535 | { |
| 538 | lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl; | 536 | lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl; |
| 539 | gViewerWindow->setCursor(UI_CURSOR_NOLOCKED); | 537 | gViewerWindow->setCursor(UI_CURSOR_NOLOCKED); |
| 540 | return TRUE; | 538 | return TRUE; |
| 541 | } | ||
| 542 | } | 539 | } |
| 543 | 540 | ||
| 544 | F64 axis_magnitude = relative_move * axis_d; // dot product | 541 | F64 axis_magnitude = relative_move * axis_d; // dot product |