summaryrefslogtreecommitdiff
path: root/indra/llwindow/llmousehandler.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-04-01 14:49:07 -0600
committerDave Houlton <euclid@lindenlab.com>2021-04-01 14:49:07 -0600
commit3cad30d9ee6a0cd2a68ed213e7383fa11df9d9f5 (patch)
tree8f47ce24e0d455c0478e6266d8a7c3874883e055 /indra/llwindow/llmousehandler.cpp
parentd357bf7ae5c5e0b6e66e7d82ce1677360b4cb990 (diff)
parent167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff)
Merge branch 'master' into DV525-merge-6.4.18
Diffstat (limited to 'indra/llwindow/llmousehandler.cpp')
-rw-r--r--indra/llwindow/llmousehandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llmousehandler.cpp b/indra/llwindow/llmousehandler.cpp
index d5fa65fe4b..e41ebd42f3 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, EClickType clicktype, BOOL down)
+BOOL LLMouseHandler::handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down)
{
BOOL handled = FALSE;
if (down)