diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
commit | 9e9d32de384b2807f195be48f49fbdec725f45d1 (patch) | |
tree | 802158bd1a8872500ffeee286256f4c3ff79ef72 /indra/llwindow | |
parent | 3c276c87bde4ff9403df93434e8dc5309a3441b9 (diff) | |
parent | defbd61d318d0da12fdea208cf2b2297d9a6b122 (diff) |
merge
Diffstat (limited to 'indra/llwindow')
-rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 4 |
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; |