summaryrefslogtreecommitdiff
path: root/indra/newview/lltool.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@Callums-MacBook-Pro.local>2021-04-01 14:35:28 -0700
committerCallum Prentice <callum@Callums-MacBook-Pro.local>2021-04-01 14:35:28 -0700
commit930b8ed36e56e08a9449833073dbdd0017bcbaa4 (patch)
tree829bb63a8e777eef0c622c085671aebe8ae351c1 /indra/newview/lltool.h
parent45af049a479928208a1ad30a90c1db6be1969f9a (diff)
parent167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff)
Merge with ti of master after Viewer release
Diffstat (limited to 'indra/newview/lltool.h')
-rw-r--r--indra/newview/lltool.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltool.h b/indra/newview/lltool.h
index 308983afda..41a38804ce 100644
--- a/indra/newview/lltool.h
+++ b/indra/newview/lltool.h
@@ -49,7 +49,7 @@ public:
virtual BOOL isView() const { return FALSE; }
// Virtual functions inherited from LLMouseHandler
- virtual BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down);
+ virtual BOOL handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
virtual BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask);