diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-27 18:20:52 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-27 18:20:52 -0400 |
| commit | ec3f8f4a67bb1a47e634d05ba29ddc6c7bed38b8 (patch) | |
| tree | 548dc379c8f3dad4997ee89035064772b9c14c8b /indra/llwindow/llwindowmacosx.cpp | |
| parent | 878eb2b61a26eef3151319cffd1d8d5196b118c2 (diff) | |
| parent | 3db6e3d9ec6c0b5a4cc9e825ee0c70eaa1461c98 (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; |