summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcachename.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2014-03-17 14:19:42 -0700
committerCallum Prentice <callum@lindenlab.com>2014-03-17 14:19:42 -0700
commitf232096bba9280dd78ef378612eeb65ae2814307 (patch)
tree17da0d7b1bd17771691c461919bbba5f1780e905 /indra/llmessage/llcachename.cpp
parent4c225e3fc7b92e68a25efdb1ca8927e266e84ae5 (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merge with viewer-release
Diffstat (limited to 'indra/llmessage/llcachename.cpp')
-rwxr-xr-xindra/llmessage/llcachename.cpp2
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)