summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-04-11 16:02:24 -0500
committerDave Parks <davep@lindenlab.com>2012-04-11 16:02:24 -0500
commit002c9b3f3d85f8d023c7abd41f0f2c834d3f17cc (patch)
tree53edcf53b1f641c875ea323854dd829bdc139295
parent31cfee6a1c7f3994a8df464d5de754163aa43cf4 (diff)
MAINT-516 Potential fix for crash on startup in LLWindowWin32::switchContext
-rw-r--r--indra/llwindow/llwindowwin32.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 987e9cb567..aceb8924f3 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -367,6 +367,10 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
U32 fsaa_samples)
: LLWindow(callbacks, fullscreen, flags)
{
+
+ //MAINT-516 -- force a load of opengl32.dll just in case windows went sideways
+ LoadLibrary(L"opengl32.dll");
+
mFSAASamples = fsaa_samples;
mIconResource = gIconResource;
mOverrideAspectRatio = 0.f;