diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-02-27 11:40:04 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-02-27 11:40:04 +0200 |
| commit | 241b09a0867fffb9ea1a333b144c9d503eba0bbc (patch) | |
| tree | 5e5db99870fbc3078c3744427d1a0a41a7b91519 | |
| parent | 22ea223ddd2f2f9ed05a447dda2c4169a77d191e (diff) | |
MAINT-4920 FIXED Reset mClickedInMouselook when left click handled by LLToolPie.
| -rwxr-xr-x | indra/newview/lltoolgrab.h | 2 | ||||
| -rwxr-xr-x | indra/newview/lltoolpie.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltoolgrab.h b/indra/newview/lltoolgrab.h index 4e22732124..5d24c8813e 100755 --- a/indra/newview/lltoolgrab.h +++ b/indra/newview/lltoolgrab.h @@ -78,6 +78,8 @@ public: // Certain grabs should not highlight the "Build" toolbar button BOOL getHideBuildHighlight() { return mHideBuildHighlight; } + void setClickedInMouselook(BOOL is_clickedInMouselook) {mClickedInMouselook = is_clickedInMouselook;} + static void pickCallback(const LLPickInfo& pick_info); private: LLVector3d getGrabPointGlobal(); diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index e4353aafaa..2081297717 100755 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -319,6 +319,7 @@ BOOL LLToolPie::handleLeftClickPick() { gGrabTransientTool = this; mMouseButtonDown = false; + LLToolGrab::getInstance()->setClickedInMouselook(gAgentCamera.cameraMouselook()); LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() ); return LLToolGrab::getInstance()->handleObjectHit( mPick ); } |