diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-24 19:47:55 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-24 19:47:55 -0700 |
| commit | fc106df53085f549acdbb2f8149ca75e400532fa (patch) | |
| tree | f4dfb0150467f41ad1d544161ee6946a53e35ad6 /indra/llrender | |
| parent | ae65347e3391be56b8919349a269e0abe52cf656 (diff) | |
fix the compiling error: "free" is defined and in use globally.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 6b1fd78733..fd2a04373b 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -598,7 +598,7 @@ void LLVertexBuffer::destroyGLBuffer() } else { - sPrivatePoolp->free(mMappedData) ; + sPrivatePoolp->freeMem(mMappedData) ; mMappedData = NULL; mEmpty = TRUE; } @@ -627,7 +627,7 @@ void LLVertexBuffer::destroyGLIndices() } else { - sPrivatePoolp->free(mMappedIndexData) ; + sPrivatePoolp->freeMem(mMappedIndexData) ; mMappedIndexData = NULL; mEmpty = TRUE; } @@ -768,7 +768,7 @@ void LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices) memset(mMappedData+oldsize, 0, newsize-oldsize); } - sPrivatePoolp->free(old); + sPrivatePoolp->freeMem(old); } else { @@ -805,7 +805,7 @@ void LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices) { memset(mMappedIndexData+old_index_size, 0, new_index_size - old_index_size); } - sPrivatePoolp->free(old); + sPrivatePoolp->freeMem(old); } else { @@ -852,8 +852,8 @@ void LLVertexBuffer::freeClientBuffer() { if(useVBOs() && sDisableVBOMapping && (mMappedData || mMappedIndexData)) { - sPrivatePoolp->free(mMappedData) ; - sPrivatePoolp->free(mMappedIndexData) ; + sPrivatePoolp->freeMem(mMappedData) ; + sPrivatePoolp->freeMem(mMappedIndexData) ; mMappedData = NULL ; mMappedIndexData = NULL ; } |