merge

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 4944de6030..197d1fa854 100755
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1984,7 +1984,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			
 			LLMatrix4a mat_vert;
 			mat_vert.loadu(mat_vert_in);
-								
+
 			F32* dst = (F32*) vert.get();
 			F32* end_f32 = dst+mGeomCount*4;
 
@@ -1995,7 +1995,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 
 
 			LLVector4a res0; //,res1,res2,res3;
-			
+
 			LLVector4a texIdx;
 
 			S32 index = mTextureIndex < 255 ? mTextureIndex : 0;
@@ -2046,14 +2046,14 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 				}*/
 
 				while (src < end)
-				{
+				{	
 					mat_vert.affineTransform(*src++, res0);
 					tmp.setSelectWithMask(mask, texIdx, res0);
 					tmp.store4a((F32*) dst);
 					dst += 4;
 				}
 			}
-			
+
 			{
 				//LLFastTimer t(FTM_FACE_POSITION_PAD);
 				while (dst < end_f32)
@@ -2079,7 +2079,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			LLVector4a* end = src+num_vertices;
 			
 			while (src < end)
-			{
+			{	
 				LLVector4a normal;
 				mat_normal.rotate(*src++, normal);
 				normal.store4a(normals);