From af17cbce9fca81b8464a6f2fa347e80e8fe29126 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sat, 20 Apr 2013 03:31:54 +0200
Subject: [PATCH] Forgot the #ifdefs for the Havok enabled version, so setCount
 of llstrider is only called on non Havok builds.

---
 indra/llrender/llrender.cpp             | 4 ++--
 indra/llrender/llvertexbuffer.cpp       | 8 ++++----
 indra/newview/llfloaterimagepreview.cpp | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index a56b98121c..42ac5346cb 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1907,11 +1907,11 @@ void LLRender::flush()
 			mBuffer->getTexCoord0Strider(mTexcoordsp, 0, count);
 			mBuffer->getColorStrider(mColorsp, 0, count);
 
-			// <FS:ND> protect against buffer overflows
+			#ifdef OPENSIM // <FS:ND> protect against buffer overflows
 			mVerticesp.setCount( mBuffer->getNumVerts() );
 			mTexcoordsp.setCount( mBuffer->getNumVerts() );
 			mColorsp.setCount( mBuffer->getNumVerts() );
-			// </FS:ND>
+			#endif // </FS:ND>
 		}
 		
 		mBuffer->flush();
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 7df848fb23..b845e2cff7 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -2057,11 +2057,11 @@ template <class T,S32 type> struct VertexBufferStrider
 			strider = (T*)ptr;
 			strider.setStride(0);
 
-			// <FS:ND> protect against buffer overflows
+			#ifdef OPENSIM // <FS:ND> protect against buffer overflows
 			if( count == -1 )
 				count = vbo.getNumIndices()-index;
 			strider.setCount( count );
-			// <FS:ND>
+			#endif // <FS:ND>
 
 			return true;
 		}
@@ -2080,11 +2080,11 @@ template <class T,S32 type> struct VertexBufferStrider
 			strider = (T*)ptr;
 			strider.setStride(stride);
 
-			// <FS:ND> protect against buffer overflows
+			#ifdef OPENSIM // <FS:ND> protect against buffer overflows
 			if( count == -1 )
 				count = vbo.getNumVerts()-index;
 			strider.setCount( count );
-			// <FS:ND>
+			#endif // <FS:ND>
 
 			return true;
 		}
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index 1f181e0722..27507cea64 100644
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -834,11 +834,11 @@ void LLImagePreviewSculpted::setPreviewTarget(LLImageRaw* imagep, F32 distance)
 	LLStrider<LLVector2> tc;
 	tc = (LLVector2*) vf.mTexCoords; tc.setStride(8);
 
-	// <FS:ND> protect against buffer overflows
+	#ifdef OPENSIM // <FS:ND> protect against buffer overflows
 	pos.setCount( vf.mNumVertices );
 	norm.setCount( vf.mNumVertices );
 	tc.setCount( vf.mNumVertices );
-	// </FS:ND>
+	#endif // </FS:ND>
 
 	for (U32 i = 0; i < num_vertices; i++)
 	{