diff --git a/doc/contributions.txt b/doc/contributions.txt
index 7a79cdaaf6..7cc7aace9e 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -209,6 +209,7 @@ Ansariel Hiller
 	MAINT-6773
 	MAINT-6906
 	MAINT-6911
+	MAINT-6917
 	STORM-2140
 	MAINT-6912
 	MAINT-6929
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index aa111764cf..88fa0e8cb6 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -11733,7 +11733,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
 	avatar->setImpostorDim(tdim);
 
-	LLVOAvatar::sUseImpostors = true; // @TODO ???
+	LLVOAvatar::sUseImpostors = (0 != LLVOAvatar::sMaxNonImpostors);
 	sUseOcclusion = occlusion;
 	sReflectionRender = FALSE;
 	sImpostorRender = FALSE;