Merge remote-tracking branch 'aleric/master'

2013-06-14 18:31:48 +02:00
parent a6a5983fbe 34b921a101
commit 8574f1ee23
7 changed files with 52 additions and 10 deletions
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -170,7 +170,7 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
                                                                         LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS,
                                                                         LLPipeline::RENDER_TYPE_HUD_PARTICLES,
                                                                         LLPipeline::END_RENDER_TYPES); 
-               gPipeline.setRenderDebugFeatureControl(LLPipeline::RENDER_DEBUG_FEATURE_UI, false);
+               gPipeline.setRenderDebugFeatureControl(~(U32)0, false);	// Reset all RENDER_DEBUG_FEATURE_* flags.
       }
       else 
       {