diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-12-03 17:10:50 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-12-03 17:10:50 +0200 |
| commit | 4de5f6a8533174696211fab8952adc7001357ba4 (patch) | |
| tree | f8ae3b71c19eb8ae493756ed56f9ab14cc872951 /indra/newview/lltoolpie.cpp | |
| parent | 99daebb1de59767c87fdfb063e01d0128d164e9c (diff) | |
SL-14455 FIXED Drag ground to turn is still active when Single click on land is set to No action
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 85d79bb045..322d0bc727 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -63,6 +63,7 @@ #include "llviewerobject.h" #include "llviewerparcelmgr.h" #include "llviewerwindow.h" +#include "llviewerinput.h" #include "llviewermedia.h" #include "llvoavatarself.h" #include "llviewermediafocus.h" @@ -743,7 +744,9 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) LL_DEBUGS("UserInput") << "hover handled by LLToolPie (inactive)" << LL_ENDL; } else if (!mMouseOutsideSlop - && mMouseButtonDown) + && mMouseButtonDown + // disable camera steering if click on land is not used for moving + && gViewerInput.isMouseBindUsed(CLICK_LEFT)) { S32 delta_x = x - mMouseDownX; S32 delta_y = y - mMouseDownY; |