diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
| commit | d6fdc6e68fc713b21b68e42740d63c3e9005bceb (patch) | |
| tree | 8692c2c7ac5e3b0bbb5fa2b5362f2796dcf71e8b /indra/llmessage/llhttpsender.cpp | |
| parent | bc7a579ba285fa64876a2bc116685f0357fe25dc (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; } |