diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-04-06 16:32:25 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-04-06 16:32:25 +0100 |
commit | bca5bb240d21e0f1bad5c3924587d62c1c7a7b7c (patch) | |
tree | 36baeda88c70a7ca58059b316641c32139b5d3f1 /indra/newview/llviewerwindow.h | |
parent | 704aeb09d81f0fa37e343460edb1ab11ba3dbc8c (diff) | |
parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) |
Merge remote-tracking branch 'origin/master' into SL-14999
Diffstat (limited to 'indra/newview/llviewerwindow.h')
-rw-r--r-- | indra/newview/llviewerwindow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index e282905a1c..8a6df613dc 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -175,8 +175,9 @@ public: void initWorldUI(); void setUIVisibility(bool); bool getUIVisibility(); + void handlePieMenu(S32 x, S32 y, MASK mask); - BOOL handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down); + BOOL handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down); // // LLWindowCallback interface implementation |