summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-12-21 11:33:58 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-12-21 11:33:58 -0500
commit03d65d4ec49d66d1a095208b35dceccf36883cc2 (patch)
treeb21294caa58a425c38eba1c1abbb530f2f17a1a8 /indra/newview
parentb3212f873d11a2e6110ab0d0d9d1cfeb57895251 (diff)
DRTVWR-418: Deal with fatal warning 'unsafe mix of bool and BOOL'
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermenu.cpp2
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();