diff --git a/doc/contributions.txt b/doc/contributions.txt
index 23aa1623017b1cd1f7a1931354c9804f2b5577dc..49a09a627fcceeb59be0e98532e048fae6bc656c 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 c6bbfb1c8ffd975cd57f9642b4319dec6a68927c..70989bacff4528302a9973590d40f51b62545665 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;