diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2012-09-24 17:19:16 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2012-09-24 17:19:16 +0000 |
| commit | 33099f4b7b55c166ba77a3e862573cd68ec4acef (patch) | |
| tree | 07626f4aa5af7a99c7c34123e25687f09715ef00 /indra/llwindow/llwindowmacosx.cpp | |
| parent | 93769c43e209b206ed06c1a812900e5e51473a74 (diff) | |
| parent | d3924200b6b8817461c0f10f87a643005466d4af (diff) | |
merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 97637c937f..413a9df616 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 use_gl, + BOOL disable_vsync, BOOL ignore_pixel_depth, U32 fsaa_samples) : LLWindow(NULL, fullscreen, flags) @@ -228,7 +228,6 @@ 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; |