summaryrefslogtreecommitdiff
path: root/indra/llmessage/llhttpsender.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/llhttpsender.cpp
parent4c225e3fc7b92e68a25efdb1ca8927e266e84ae5 (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
Merge with viewer-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;
}