From 5921cc9d8a3896af70836eb2dbc8c8085e13ee43 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 9 Nov 2016 14:20:46 +0200
Subject: [PATCH] MAINT-6917 Setting one avatar to "Do not render" causes all
 avatars to become imposters

---
 doc/contributions.txt      | 1 +
 indra/newview/pipeline.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 23aa1623017..49a09a627fc 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -206,6 +206,7 @@ Ansariel Hiller
 	MAINT-6773
 	MAINT-6906
 	MAINT-6911
+	MAINT-6917
 	STORM-2140
 Aralara Rajal
 Arare Chantilly
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index c6bbfb1c8ff..70989bacff4 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -11623,7 +11623,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
 	avatar->setImpostorDim(tdim);
 
-	LLVOAvatar::sUseImpostors = true; // @TODO ???
+	LLVOAvatar::sUseImpostors = (0 != LLVOAvatar::sMaxNonImpostors);
 	sUseOcclusion = occlusion;
 	sReflectionRender = FALSE;
 	sImpostorRender = FALSE;
-- 
GitLab