diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index f49852636726037db021dcf7cf318fef8a4a5dc3..e3035c71942cc1bf071e76d78d503ad1bb8da252 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -960,17 +960,6 @@ S32 LLVertexBuffer::determineUsage(S32 usage)
 	    }
 	}
 	
-    if (ret_usage == 0)
-    {
-            if (sDisableVBOMapping)
-		    { //always use stream draw if VBO mapping is disabled
-			    ret_usage = GL_STREAM_DRAW_ARB;
-		    }
-		    else
-		    {
-			    ret_usage = GL_DYNAMIC_DRAW_ARB;
-		    }
-    }
 	return ret_usage;
 }
 
@@ -1000,8 +989,6 @@ LLVertexBuffer::LLVertexBuffer(U32 typemask, S32 usage)
 	mMappable(false),
 	mFence(NULL)
 {
-    llassert(mUsage != 0);
-
 	mMappable = (mUsage == GL_DYNAMIC_DRAW_ARB && !sDisableVBOMapping);
 
 	//zero out offsets
@@ -1547,7 +1534,7 @@ bool LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices)
 bool LLVertexBuffer::useVBOs() const
 {
 	//it's generally ineffective to use VBO for things that are streaming on apple
-	return sEnableVBOs && (mUsage != 0);
+	return (mUsage != 0);
 }
 
 //----------------------------------------------------------------------------