summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpsender.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-03-27 11:59:35 -0700
committerAura Linden <aura@lindenlab.com>2014-03-27 11:59:35 -0700
commitdfd78e83d91832b486a5bba6b1bb1cce621163ab (patch)
tree5d27537583ea1f06c0e7b469f83ed65c93f70d15 /indra/llmessage/llhttpsender.cpp
parent22ea5ac41ca3a1f7a884b56526791f611834f76b (diff)
parent31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff)
Pulled merge from release
Diffstat (limited to 'indra/llmessage/llhttpsender.cpp')
-rwxr-xr-xindra/llmessage/llhttpsender.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llmessage/llhttpsender.cpp b/indra/llmessage/llhttpsender.cpp
index c48cbc42a6..d0bd343db6 100755
--- a/indra/llmessage/llhttpsender.cpp
+++ b/indra/llmessage/llhttpsender.cpp
@@ -38,7 +38,7 @@ namespace
{
typedef std::map<LLHost, LLHTTPSender*> SenderMap;
static SenderMap senderMap;
- static LLHTTPSender* defaultSender = new LLHTTPSender();
+ static LLPointer<LLHTTPSender> defaultSender(new LLHTTPSender());
}
//virtual
@@ -90,6 +90,5 @@ void LLHTTPSender::clearSender(const LLHost& host)
//static
void LLHTTPSender::setDefaultSender(LLHTTPSender* sender)
{
- delete defaultSender;
defaultSender = sender;
}