From 84222286ccb5ebb50e5f4da2dd5d4e87253b37d4 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 9 Nov 2017 23:05:35 +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 c98c974e628..88322bdfe15 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -217,6 +217,7 @@ Ansariel Hiller
 	MAINT-6519
 	MAINT-7899
 	STORM-2105
+	MAINT-6917
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 1d083bb2fd4..2f17fb54adb 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -11622,7 +11622,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