diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-10-29 15:15:10 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2015-10-29 15:15:10 +0200 |
| commit | 2b19f3d87b9f7f77a3eac9205cdbe2c2b72ded44 (patch) | |
| tree | f2ad8814f259fd8b9fc398face1d4128795368a4 /indra/newview/llviewermenu.cpp | |
| parent | e74987041f97ea8345dae8b048adfda46670fb78 (diff) | |
| parent | 8019eba6af62c81f7ed29105d4d345e78b3f8432 (diff) | |
Merged lindenlab/viewer-lion into default
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 38d62dee5e..de219edcff 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1245,9 +1245,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; } }; |