fix for SH-1561: Enabling show Physics Shape disables glow

1 files changed, 15 insertions, 0 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1489c033e2..4d678117a5 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -773,14 +773,29 @@ void LLPipeline::updateRenderDeferred()
 //static
 void LLPipeline::refreshRenderDeferred()
 {
+	static BOOL physics_shapes_is_on = FALSE ;
+	static BOOL render_glow_copy = FALSE ;
+
 	if(gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PHYSICS_SHAPES))
 	{
+		if(!physics_shapes_is_on)
+		{
+			physics_shapes_is_on = TRUE ;
+			render_glow_copy = sRenderGlow ;
+		}
+
 		//turn the deferred rendering and glow off when draw physics shapes.
 		sRenderDeferred = FALSE ;
 		sRenderGlow = FALSE ;
 	}
 	else
 	{
+		if(physics_shapes_is_on)
+		{
+			physics_shapes_is_on = FALSE ;
+			sRenderGlow = render_glow_copy ;
+		}
+
 		updateRenderDeferred() ;
 	}
 }