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/llwindow/llmousehandler.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/llwindow/llmousehandler.cpp')
| -rw-r--r-- | indra/llwindow/llmousehandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llmousehandler.cpp b/indra/llwindow/llmousehandler.cpp index e41ebd42f3..d5fa65fe4b 100644 --- a/indra/llwindow/llmousehandler.cpp +++ b/indra/llwindow/llmousehandler.cpp @@ -27,7 +27,7 @@ #include "llmousehandler.h" //virtual -BOOL LLMouseHandler::handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down) +BOOL LLMouseHandler::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down) { BOOL handled = FALSE; if (down) |