summaryrefslogtreecommitdiff
path: root/indra/llrender/llvertexbuffer.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-19 13:51:35 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-19 13:51:35 +0000
commit49b37a4dc362679e94fe04ff3cd7094f0e0e9f68 (patch)
tree9832afd6820bc0122fb8eef0552bbfab58736492 /indra/llrender/llvertexbuffer.cpp
parentc3a71b7dcbfe855058a84e22651aea3910133aa1 (diff)
parent8bafcc0491d0131a53226365f18b3ba68648a742 (diff)
merge from viewer2, conflicts resolved...
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
-rw-r--r--indra/llrender/llvertexbuffer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index bf5eda21eb..116e265914 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -579,7 +579,7 @@ void LLVertexBuffer::destroyGLBuffer()
}
mGLBuffer = 0;
- unbind();
+ //unbind();
}
void LLVertexBuffer::destroyGLIndices()
@@ -606,7 +606,7 @@ void LLVertexBuffer::destroyGLIndices()
}
mGLIndices = 0;
- unbind();
+ //unbind();
}
void LLVertexBuffer::updateNumVerts(S32 nverts)