diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-29 10:50:58 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-29 10:50:58 -0600 |
| commit | adbd264d35f5fabe28249839da6c12e5dac4127f (patch) | |
| tree | f32db7fd6849a7dd490d94b1eaee160db95fe7f0 /indra | |
| parent | e46323b0b9fea77522ee4637a82e2e86de15bb83 (diff) | |
| parent | 47166eba9e77130835d4a7ba5d116f538b50d375 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index efc2726785..6e0bbb05ee 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -529,7 +529,11 @@ static void settings_to_globals() LLSurface::setTextureSize(gSavedSettings.getU32("RegionTextureSize")); +#if LL_DARWIN + LLRender::sGLCoreProfile = true; +#else LLRender::sGLCoreProfile = gSavedSettings.getBOOL("RenderGLContextCoreProfile"); +#endif LLRender::sNsightDebugSupport = gSavedSettings.getBOOL("RenderNsightDebugSupport"); LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO"); LLImageGL::sGlobalUseAnisotropic = gSavedSettings.getBOOL("RenderAnisotropic"); |