diff options
| author | prep <prep@lindenlab.com> | 2013-03-11 17:29:05 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-03-11 17:29:05 -0400 |
| commit | 9ea6a96be9a5fda489d5e5ce28fc2df7c6f4c309 (patch) | |
| tree | 9db5e64a1784aba260173666eb0b01af31c5485e /indra/llwindow/llwindowmacosx.cpp | |
| parent | 8e3b190e919fde84a2189d974208f9d199d4bea6 (diff) | |
LLWindow merge fixes for Mac
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 413a9df616..97637c937f 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -210,7 +210,7 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks, const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height, U32 flags, BOOL fullscreen, BOOL clearBg, - BOOL disable_vsync, + BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth, U32 fsaa_samples) : LLWindow(NULL, fullscreen, flags) @@ -228,6 +228,7 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks, gKeyboard = new LLKeyboardMacOSX(); gKeyboard->setCallbacks(callbacks); + // Ignore use_gl for now, only used for drones on PC mWindow = NULL; mContext = NULL; mPixelFormat = NULL; |