diff options
| author | simon <none@none> | 2014-02-21 11:18:12 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-21 11:18:12 -0800 |
| commit | ea944fd58f6fcaf29a939ed10e9fd5e07b9fb923 (patch) | |
| tree | d18a3d5fc4f3220fc6d36d24e8cb1b05630e1f9f /indra/llmessage/llcachename.cpp | |
| parent | a23fc01c7b12299297124f4b5b6ad4e7a8145c00 (diff) | |
| parent | 76913530ed04798536e8469dbeaea9e512d122aa (diff) | |
Merge downstream code
Diffstat (limited to 'indra/llmessage/llcachename.cpp')
| -rwxr-xr-x | indra/llmessage/llcachename.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index 267c48e1d2..13d779ff83 100755 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -278,7 +278,9 @@ LLCacheName::Impl::Impl(LLMessageSystem* msg) LLCacheName::Impl::~Impl() { for_each(mCache.begin(), mCache.end(), DeletePairedPointer()); + mCache.clear(); for_each(mReplyQueue.begin(), mReplyQueue.end(), DeletePointer()); + mReplyQueue.clear(); } boost::signals2::connection LLCacheName::Impl::addPending(const LLUUID& id, const LLCacheNameCallback& callback) |