diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-18 11:55:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-18 11:55:30 -0700 |
| commit | 6393e88ca47998fc5dfae3ce2fc2fd41bf568f49 (patch) | |
| tree | a0c17d1b8e499740934f88780b2043e264eab078 /indra/llwindow/llwindowmacosx.cpp | |
| parent | d0dfffe659b24f5a6bfadc5cc612869e1f08bb93 (diff) | |
| parent | 4e593dcded0ab1cc033a9be4d0489d12a8305a7e (diff) | |
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
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 cd00f4d33c..80001b14ee 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -122,8 +122,7 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks, bool fullscreen, bool clearBg, bool enable_vsync, bool use_gl, bool ignore_pixel_depth, - U32 fsaa_samples, - U32 max_vram) + U32 fsaa_samples) : LLWindow(NULL, fullscreen, flags) { // *HACK: During window construction we get lots of OS events for window |