diff options
author | Graham Madarasz <graham@lindenlab.com> | 2018-02-16 20:52:10 +0000 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2018-02-16 20:52:10 +0000 |
commit | 5efc817d9a76fe0b169b831393d794fc2257261b (patch) | |
tree | 6bdfe387970573748d66453cbe466fe356501305 /indra/newview/llappviewer.cpp | |
parent | b2f61c0e0b27b9c1dae33a85bfc4db6b3ce95dc0 (diff) | |
parent | caa60a57310a01041cca74be789935ae6135f4eb (diff) |
Merged in graham_linden/viewer-neko (pull request #525)
Fixes MAINT-8282 feature req (from me :) )
Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Ruslan Teliuk <ruslantproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d9273dfcb5..a0750214a8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -583,6 +583,7 @@ static void settings_to_globals() LLSurface::setTextureSize(gSavedSettings.getU32("RegionTextureSize")); LLRender::sGLCoreProfile = gSavedSettings.getBOOL("RenderGLCoreProfile"); + LLRender::sNsightDebugSupport = gSavedSettings.getBOOL("RenderNsightDebugSupport"); LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO"); LLImageGL::sGlobalUseAnisotropic = gSavedSettings.getBOOL("RenderAnisotropic"); LLImageGL::sCompressTextures = gSavedSettings.getBOOL("RenderCompressTextures"); |