summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrian McGroarty <soft@lindenlab.com>2008-04-18 17:03:26 +0000
committerBrian McGroarty <soft@lindenlab.com>2008-04-18 17:03:26 +0000
commit06e8af59a92a1341e5ff343d49d341127d67de8c (patch)
treeac851aa5526e384d6873617fa377d0ff787d58af /indra
parent669d1162f4c7529296d7018ec65960f120cc1c3e (diff)
QAR-493 Linux startup crash
Diffstat (limited to 'indra')
-rw-r--r--indra/llwindow/llwindowsdl.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 5ed6094f4a..3e39ecfa2e 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -759,6 +759,9 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
#if LL_X11
init_x11clipboard();
#endif // LL_X11
+
+ //make sure multisampling is disabled by default
+ glDisable(GL_MULTISAMPLE_ARB);
// We need to do this here, once video is init'd
if (-1 == SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY,