diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-18 11:48:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-18 11:48:37 -0700 |
| commit | 4e593dcded0ab1cc033a9be4d0489d12a8305a7e (patch) | |
| tree | eb12b6af64b6da0444776034025fec9141ce41ce /indra/llwindow/llwindowmacosx.cpp | |
| parent | 3da16d1899324b358ac0d27ddd99bf8214f6fb54 (diff) | |
| parent | 7342ebf43aa7500afe7410b49689a3aefa669e58 (diff) | |
Merge pull request #1797 from secondlife/release/maint-a
merge release/maint-a into develop and close maint-a
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 |