diff options
author | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-03-11 15:23:46 -0400 |
commit | b6708435214a5af158956b0f6ef6a90bacbcc142 (patch) | |
tree | 1a0f0612cc87d43e33d466afc7d6928ec7a2e20b /indra/llmessage/llhttpsender.cpp | |
parent | 20d486b52fb8ecefc03eb63a93e4447513d704d2 (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llmessage/llhttpsender.cpp')
-rwxr-xr-x | indra/llmessage/llhttpsender.cpp | 3 |
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; } |