summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-28 16:32:54 -0500
committerDave Parks <davep@lindenlab.com>2012-06-28 16:32:54 -0500
commitbedbbf7c0201275e0a48a0cbbb2a567be4baab3d (patch)
treef11f9e612ab503e596073269c17c6e4cc1d3ae13 /indra/llwindow
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
parentf3afac420cd3c89eb396fb1f0b77ab4804212415 (diff)
Merge
Diffstat (limited to 'indra/llwindow')
-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 e07fbddb94..6f0d90be06 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;