diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-24 00:08:35 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-06-24 00:08:35 +0300 |
| commit | b8127f80c7e305b0c5af7a824b45c81432a8e6b8 (patch) | |
| tree | ed34b16459488ce3e6293f84447f04c31ce4887a /indra/newview/lltool.cpp | |
| parent | aabb0bbc49aa15b100dc8c2cbf286202cb084646 (diff) | |
| parent | 05f3287512557cd4cb41de7a8fe3f5171a48481d (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/llcommon/llkeybind.cpp
# indra/llcommon/llkeybind.h
Diffstat (limited to 'indra/newview/lltool.cpp')
| -rw-r--r-- | indra/newview/lltool.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp index 5235914c34..c5e31ff8e6 100644 --- a/indra/newview/lltool.cpp +++ b/indra/newview/lltool.cpp @@ -60,7 +60,7 @@ LLTool::~LLTool() } } -BOOL LLTool::handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down) +BOOL LLTool::handleAnyMouseClick(S32 x, S32 y, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down) { BOOL result = LLMouseHandler::handleAnyMouseClick(x, y, mask, clicktype, down); @@ -83,9 +83,9 @@ BOOL LLTool::handleMouseDown(S32 x, S32 y, MASK mask) LL_INFOS() << "LLTool left mouse down" << LL_ENDL; } // by default, didn't handle it - // AGENT_CONTROL_LBUTTON_DOWN is handled by scanMouse() and scanKey() // LL_INFOS() << "LLTool::handleMouseDown" << LL_ENDL; - return FALSE; + gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_DOWN); + return TRUE; } BOOL LLTool::handleMouseUp(S32 x, S32 y, MASK mask) @@ -95,8 +95,8 @@ BOOL LLTool::handleMouseUp(S32 x, S32 y, MASK mask) LL_INFOS() << "LLTool left mouse up" << LL_ENDL; } // by default, didn't handle it - // AGENT_CONTROL_LBUTTON_UP is handled by scanMouse() and scanKey() // LL_INFOS() << "LLTool::handleMouseUp" << LL_ENDL; + gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_UP); return TRUE; } |