diff options
| author | McCabe Maxsted | 2011-03-19 14:13:38 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-19 14:13:38 -0700 |
| commit | c144b6636342a5e2b4b8bce3e714c96b593f20aa (patch) | |
| tree | 63f263a8641238ac3ce10974f668e791e869bd3d /linden/indra/newview/llmaniptranslate.cpp | |
| parent | Merge remote-tracking branch 'armin/exp' into exp (diff) | |
| parent | Package both libz.so.1 and libz.so (symlink) on Linux32. (IMP-790) (diff) | |
| download | meta-impy-c144b6636342a5e2b4b8bce3e714c96b593f20aa.zip meta-impy-c144b6636342a5e2b4b8bce3e714c96b593f20aa.tar.gz meta-impy-c144b6636342a5e2b4b8bce3e714c96b593f20aa.tar.bz2 meta-impy-c144b6636342a5e2b4b8bce3e714c96b593f20aa.tar.xz | |
Merge remote-tracking branch 'jacek/exp' into exp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llmaniptranslate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp index 8484c4e..3b78553 100644 --- a/linden/indra/newview/llmaniptranslate.cpp +++ b/linden/indra/newview/llmaniptranslate.cpp | |||
| @@ -531,7 +531,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask) | |||
| 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 | F32 max_drag_distance = gHippoLimits->getMaxDragDistance(); | 532 | F32 max_drag_distance = gHippoLimits->getMaxDragDistance(); |
| 533 | 533 | ||
| 534 | if (max_drag_distance != FLT_MAX && 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) |
| 535 | { | 535 | { |
| 536 | lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl; | 536 | lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl; |
| 537 | gViewerWindow->setCursor(UI_CURSOR_NOLOCKED); | 537 | gViewerWindow->setCursor(UI_CURSOR_NOLOCKED); |