diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-28 20:41:34 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-28 20:41:34 +0200 |
| commit | b2f1e8899b32f681e13705d684db9a93d18450ae (patch) | |
| tree | 70ee7701d7a24a0759915f8050786ed43a8a2a7a /indra/llwindow/llsdl.cpp | |
| parent | 0ef7a9b39cf72da1211039ab22bdf8f9f6a2c984 (diff) | |
| parent | 65764a5b7bab573b261386aca11a7967a21ec2d2 (diff) | |
Merge branch 'develop' into marchcat/c-develop
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
Diffstat (limited to 'indra/llwindow/llsdl.cpp')
| -rw-r--r-- | indra/llwindow/llsdl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llwindow/llsdl.cpp b/indra/llwindow/llsdl.cpp index 6161bd2972..3f7992a1d7 100644 --- a/indra/llwindow/llsdl.cpp +++ b/indra/llwindow/llsdl.cpp @@ -56,6 +56,7 @@ void init_sdl() std::initializer_list<std::tuple< char const*, char const * > > hintList = { {SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR,"0"}, + {SDL_HINT_VIDEODRIVER,"wayland,x11"}, {SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH,"1"}, {SDL_HINT_IME_INTERNAL_EDITING,"1"} }; |