diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-09-27 16:54:18 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-09-27 16:54:18 -0400 |
| commit | f6649fc31fa837a5650beb776b5f7f26e53440ec (patch) | |
| tree | 16ef5a0e38883580ef637a09f314c59c52c4f84a /indra/llwindow/llwindowmacosx.cpp | |
| parent | 352698140775e62498686f80b5aa21aee85524cf (diff) | |
| parent | 637fb26dd892d57a87698180adf9a8122c48b996 (diff) | |
Merging sunshine-experimental into sunshine-internal
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; |