diff --git a/doc/contributions.txt b/doc/contributions.txt
index c98c974e628690245994ebca112e651141a05543..88322bdfe151426ff8a1ed5936ed0a3ff07db7ed 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 1d083bb2fd4d474e467d3c5fab35e3f3313e8761..2f17fb54adb6b011e3f851bd16450a3940ba56cc 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;