diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-21 09:04:26 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-21 09:04:26 -0800 |
| commit | 84bf05e003d7f7aa7c7cc491b9496d78ffaac4b4 (patch) | |
| tree | 685894c1acca58d1a8ce7fb44833b29054520913 /indra/newview/llviewermenu.cpp | |
| parent | d34530fd07e62c25e010e6373860b358855c96cd (diff) | |
| parent | 03d65d4ec49d66d1a095208b35dceccf36883cc2 (diff) | |
Automated merge with head of lindenlab/nat_viewer64
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index b657726ef8..52dae4c0ac 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1221,7 +1221,7 @@ class LLAdvancedToggleWireframe : public view_listener_t LLPipeline::updateRenderDeferred(); gPipeline.resetVertexBuffers(); - if (!gUseWireframe && !gInitialDeferredModeForWireframe && LLPipeline::sRenderDeferred != gInitialDeferredModeForWireframe && gPipeline.isInit()) + if (!gUseWireframe && !gInitialDeferredModeForWireframe && LLPipeline::sRenderDeferred != bool(gInitialDeferredModeForWireframe) && gPipeline.isInit()) { LLPipeline::refreshCachedSettings(); gPipeline.releaseGLBuffers(); |