diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
| commit | 5797711cbdb553b39e6bc6ad7d9250e3208e5633 (patch) | |
| tree | 5071e15e3240c3e39fe42a26f4c45bd63ccb381a /indra/newview/llviewerwindow.cpp | |
| parent | a0089c432ac9008f5d2f7ef2a332afa10c5a2615 (diff) | |
| parent | f9f5b538b21ae57f34009b36d4831d2a7000c20c (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 8516bbc7ec..c6ed6ffb7d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -996,7 +996,7 @@ void LLViewerWindow::handlePieMenu(S32 x, S32 y, MASK mask) } } -BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down) +BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK mask, EMouseClickType clicktype, BOOL down, bool& is_toolmgr_action) { const char* buttonname = ""; const char* buttonstatestr = ""; @@ -1145,6 +1145,7 @@ BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window, LLCoordGL pos, MASK m if(!gDisconnected && LLToolMgr::getInstance()->getCurrentTool()->handleAnyMouseClick( x, y, mask, clicktype, down ) ) { LLViewerEventRecorder::instance().clear_xui(); + is_toolmgr_action = true; return TRUE; } |