Merge downstream code

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 3393d352de..aa94110f4d 100755
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1872,33 +1872,33 @@ void LLRender::flush()
 		//store mCount in a local variable to avoid re-entrance (drawArrays may call flush)
 		U32 count = mCount;
 
-		if (mMode == LLRender::QUADS && !sGLCoreProfile)
-		{
-			if (mCount%4 != 0)
+			if (mMode == LLRender::QUADS && !sGLCoreProfile)
 			{
+				if (mCount%4 != 0)
+				{
 				count -= (mCount % 4);
 				llwarns << "Incomplete quad requested." << llendl;
+				}
 			}
-		}
-
-		if (mMode == LLRender::TRIANGLES)
-		{
-			if (mCount%3 != 0)
+			
+			if (mMode == LLRender::TRIANGLES)
 			{
+				if (mCount%3 != 0)
+				{
 				count -= (mCount % 3);
 				llwarns << "Incomplete triangle requested." << llendl;
+				}
 			}
-		}
-
-		if (mMode == LLRender::LINES)
-		{
-			if (mCount%2 != 0)
+			
+			if (mMode == LLRender::LINES)
 			{
+				if (mCount%2 != 0)
+				{
 				count -= (mCount % 2);
 				llwarns << "Incomplete line requested." << llendl;
 			}
 		}
-		
+
 		mCount = 0;
 
 		if (mBuffer->useVBOs() && !mBuffer->isLocked())