From 002c9b3f3d85f8d023c7abd41f0f2c834d3f17cc Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 11 Apr 2012 16:02:24 -0500
Subject: MAINT-516 Potential fix for crash on startup in
 LLWindowWin32::switchContext

---
 indra/llwindow/llwindowwin32.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llwindow/llwindowwin32.cpp')

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;
-- 
cgit v1.2.3