diff options
author | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
commit | e7eaa94dfa1eba24cbf1667190a0be37b2f417e4 (patch) | |
tree | 9e9db05ef4d37698a7fa5f68149f724aa569528d /indra/newview/llviewermenu.cpp | |
parent | 34fe371bfdeb6fc83818c58660c038c372c0f64a (diff) | |
parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) |
Merge VR
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rwxr-xr-x | indra/newview/llviewermenu.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index f32ae27073..fd47ec9903 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1212,9 +1212,24 @@ class LLAdvancedToggleWireframe : public view_listener_t bool handleEvent(const LLSD& userdata) { gUseWireframe = !(gUseWireframe); + + if (gUseWireframe) + { + gInitialDeferredModeForWireframe = LLPipeline::sRenderDeferred; + } + gWindowResized = TRUE; LLPipeline::updateRenderDeferred(); gPipeline.resetVertexBuffers(); + + if (!gUseWireframe && !gInitialDeferredModeForWireframe && LLPipeline::sRenderDeferred != gInitialDeferredModeForWireframe && gPipeline.isInit()) + { + LLPipeline::refreshCachedSettings(); + gPipeline.releaseGLBuffers(); + gPipeline.createGLBuffers(); + LLViewerShaderMgr::instance()->setShaders(); + } + return true; } }; |