Commits

Scott Lawrence committed 0d5b712

correct faulty merge

  • Participants
  • Parent commits 82c4808

Comments (0)

Files changed (1)

indra/newview/llvovolume.cpp

 
 			LLVector4a* pos = dst_face.mPositions;
 
+			if( pos && weight && dst_face.mExtents )
 			{
 				LLFastTimer t(FTM_SKIN_RIGGED);
 
 		
 		std::vector<LLViewerTexture*> texture_list;
 
-		if( pos && weight && dst_face.mExtents )
 		{
 			LLFastTimer t(FTM_GEN_DRAW_INFO_FACE_SIZE);
 			if (batch_textures)
 		//create vertex buffer
 		LLVertexBuffer* buffer = NULL;
 
-		if( dst_face.mExtents )
 		{
 			LLFastTimer t(FTM_GEN_DRAW_INFO_ALLOCATE);
 			buffer = createVertexBuffer(mask, buffer_usage);