summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpsender.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-03-10 20:34:43 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-03-10 20:34:43 -0400
commit9c29000ba2f8192985ad0bf20889739ad12dd569 (patch)
tree3670a18100453ef589a04d40da5aa314b99f5d11 /indra/llmessage/llhttpsender.cpp
parent71e237a3f79cd90b432205460fe6e5c6b536d9db (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merge. Refresh from viewer-release after 3.7.3 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;
}