From a1421a90e62abff60298ff07666db9664a3e89d1 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 21 Apr 2010 16:50:15 -0500
Subject: Make attached lights not render when disabled in deferred rendering.
 (transplanted from 4be49811a590ad3107af3f546475ee6d33928120)

---
 indra/newview/pipeline.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 37ab95f0e8..af0aa41ca5 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6664,6 +6664,15 @@ void LLPipeline::renderDeferredLighting()
 						continue;
 					}
 
+					if (volume->isAttachment())
+					{
+						if (!sRenderAttachedLights)
+						{
+							continue;
+						}
+					}
+
+
 					LLVector3 center = drawablep->getPositionAgent();
 					F32* c = center.mV;
 					F32 s = volume->getLightRadius()*1.5f;
-- 
cgit v1.2.3