diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-03-10 20:34:43 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-03-10 20:34:43 -0400 |
| commit | 9c29000ba2f8192985ad0bf20889739ad12dd569 (patch) | |
| tree | 3670a18100453ef589a04d40da5aa314b99f5d11 /indra/llvfs/llvfs.cpp | |
| parent | 71e237a3f79cd90b432205460fe6e5c6b536d9db (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
Merge. Refresh from viewer-release after 3.7.3 release.
Diffstat (limited to 'indra/llvfs/llvfs.cpp')
| -rwxr-xr-x | indra/llvfs/llvfs.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 82c926620a..7b589f5b96 100755 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -578,6 +578,7 @@ LLVFS::~LLVFS() mFreeBlocksByLength.clear(); for_each(mFreeBlocksByLocation.begin(), mFreeBlocksByLocation.end(), DeletePairedPointer()); + mFreeBlocksByLocation.clear(); unlockAndClose(mDataFP); mDataFP = NULL; @@ -1835,6 +1836,7 @@ void LLVFS::audit() } for_each(audit_blocks.begin(), audit_blocks.end(), DeletePointer()); + audit_blocks.clear(); } |