merge changes for DRTVWR-417

1 files changed, 8 insertions, 1 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index a4d41164e5..af29a1751a 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6115,7 +6115,9 @@ void LLPipeline::calcNearbyLights(LLCamera& camera)
 			const Light* light = &(*iter);
 			LLDrawable* drawable = light->drawable;
             const LLViewerObject *vobj = light->drawable->getVObj();
-            if(vobj && vobj->getAvatar() && vobj->getAvatar()->isTooComplex())
+            if(vobj && vobj->getAvatar() 
+               && (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList())
+               )
             {
                 drawable->clearState(LLDrawable::NEARBY_LIGHT);
                 continue;
@@ -8664,6 +8666,11 @@ void LLPipeline::renderDeferredLighting()
 						}
 					}
 
+					const LLViewerObject *vobj = drawablep->getVObj();
+					if(vobj && vobj->getAvatar() && vobj->getAvatar()->isInMuteList())
+					{
+						continue;
+					}
 
 					LLVector4a center;
 					center.load3(drawablep->getPositionAgent().mV);