Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh

# Conflicts:
#	indra/llcommon/llindexedvector.h

indra/newview/llvoavatar.cpp

@@ -10627,8 +10627,12 @@ void LLVOAvatar::idleUpdateRenderComplexity()
 		}
 	}
 
-	// Render Complexity
-	calculateUpdateRenderComplexity(); // Update mVisualComplexity if needed	
+	if (mComplexityTimer.getElapsedTimeF32() > 5.f)
+	{
+		// Render Complexity
+		calculateUpdateRenderComplexity(); // Update mVisualComplexity if needed
+		mComplexityTimer.start();
+	}
 
 	if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_SHAME))
 	{