diff options
| author | prep <prep@lindenlab.com> | 2011-05-25 12:42:06 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-05-25 12:42:06 -0400 |
| commit | 7392cf49bae155e7d53413e9f73143906ae8e310 (patch) | |
| tree | cbc53ba683744a0f50536998263f71327dc86a35 /indra/newview/llvocache.cpp | |
| parent | b76d15ed14abfe3b4c422ba9ff3d4151de8a31ea (diff) | |
| parent | 594f1da03b02d09c57699b543692ebd85cdcff17 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvocache.cpp')
| -rw-r--r-- | indra/newview/llvocache.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index b888a263d0..c605ddb1c8 100644 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -76,6 +76,7 @@ LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file) S32 size = -1; BOOL success; + mDP.assignBuffer(mBuffer, 0); success = check_read(apr_file, &mLocalID, sizeof(U32)); if(success) { @@ -136,10 +137,11 @@ LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file) LLVOCacheEntry::~LLVOCacheEntry() { - if(mBuffer) + if(mBuffer != mDP.getBuffer()) { - delete[] mBuffer; + delete[] mBuffer ; //just in case } + mDP.freeBuffer(); } |