diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-09-11 22:01:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-11 22:01:24 +0300 |
| commit | af221b2e583f34fa4bf9d1d59e91fd9fcb5887b7 (patch) | |
| tree | a892b4779a80ea52c640ccfb237eddcccb056ed8 /indra/llwindow/llwindowwin32.cpp | |
| parent | 20f4a772919afad60739a61a441c9e84251e31c0 (diff) | |
| parent | 01f554d1a0a461f1ad3d7321566a04e7987038df (diff) | |
Merge from 26.4 into develop
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index bfdf011167..c4692f6c71 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2548,7 +2548,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ // minimize the viewer and hide its owned dialog. if (!activating && activating_same_process_thread) { - activating = TRUE; + return; } if (window_imp->mFullscreen) |