diff options
author | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
commit | b86c36eafcdb0fb42c1b68ef671050dea67dc6c3 (patch) | |
tree | dfa54e83a9ccac2c5346210c05626e61760e2822 /indra/llwindow/llwindowcallbacks.cpp | |
parent | 48ccb0f75b078670ced1f8fe8d4942abe0a6f293 (diff) | |
parent | 423df2ba4b731417796478c449e3e8f3d166ef21 (diff) |
Merge remote-tracking branch 'remotes/origin/develop' into rider/bot_tattle
Fix conflicts
Diffstat (limited to 'indra/llwindow/llwindowcallbacks.cpp')
-rw-r--r-- | indra/llwindow/llwindowcallbacks.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp index c160382c17..195f68e08b 100644 --- a/indra/llwindow/llwindowcallbacks.cpp +++ b/indra/llwindow/llwindowcallbacks.cpp @@ -194,6 +194,11 @@ bool LLWindowCallbacks::handleDPIChanged(LLWindow *window, F32 ui_scale_factor, return false; } +bool LLWindowCallbacks::handleDisplayChanged() +{ + return false; +} + bool LLWindowCallbacks::handleWindowDidChangeScreen(LLWindow *window) { return false; |