summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindow.cpp
diff options
context:
space:
mode:
authorleviathan <leviathan@lindenlab.com>2024-09-03 15:38:35 -0700
committerAndrew Meadows <andrew.l.meadows@gmail.com>2024-10-03 09:16:46 -0700
commit0617923ae7f450ece7288f8a73446c45a8ed32db (patch)
tree1914627e41be3619eb335aa28e6acdfb98925ea0 /indra/llwindow/llwindow.cpp
parent8213a0fb6b3149042d6833c8f0c4a3c1bfdc8bc9 (diff)
remove crashy LLSD ctor used by GameControl
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
-rw-r--r--indra/llwindow/llwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 861fd10e30..93ac58ca6f 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -39,6 +39,7 @@
#include "llerror.h"
#include "llkeyboard.h"
+#include "llsdl.h"
#include "llwindowcallbacks.h"
@@ -415,6 +416,7 @@ LLWindow* LLWindowManager::createWindow(
if (use_gl)
{
+ init_sdl();
#if LL_WINDOWS
new_window = new LLWindowWin32(callbacks,
title, name, x, y, width, height, flags,
@@ -462,6 +464,7 @@ bool LLWindowManager::destroyWindow(LLWindow* window)
window->close();
sWindowList.erase(window);
+ quit_sdl();
delete window;