diff options
author | Merov Linden <merov@lindenlab.com> | 2014-03-10 15:30:38 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 15:30:38 -0700 |
commit | 8b5ce1e474ac621fc0d8da029e710734792e319d (patch) | |
tree | d5ad22286bd84418d9ba6356017003d891165243 /indra/llmessage/llcachename.cpp | |
parent | c64e878333ed86c83b0d82c10cc61d4d8d3e8af2 (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Pull merge from lindenlab/viewer-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) |