diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-09-11 11:29:40 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-09-11 11:29:40 +0800 |
| commit | 9391fa2734ae74e9d49d74f7b2df181b526c6605 (patch) | |
| tree | a635dd244fe6b50c1fee5c177154cd3f6aae43d5 /indra/llwindow/llwindowwin32.cpp | |
| parent | ede7041a12f9d5e3839d21e10f03e2a5ff4915c2 (diff) | |
| parent | d91cd7a07489c43bf922de246ec5f22f1b3874f3 (diff) | |
Merge tag 'Second_Life_Release#d91cd7a0-26.4' into 26.4
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 7f371ff0cf..ab857fa58d 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2550,7 +2550,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) |