diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:47:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-10 15:47:27 -0400 |
| commit | 0f3ba54a7ececa4d6f7c247a3ffa3a2f9572268e (patch) | |
| tree | c7d3d7cc7a6d1a22ad7b69f45ade31ef4780f9e6 /indra/llmessage/llcachename.cpp | |
| parent | 2b4d3fff706d098076bb6c0a7dce2ca35b83300f (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
merge changes for 3.7.3-release
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) |