1 files changed, 14 insertions, 7 deletions

diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 29f232c..ab41cca 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -1344,12 +1344,17 @@ LLMessageSystem::~LLMessageSystem()
                 end_net();
         }
         
-        delete mMessageReader;
+        delete mTemplateMessageReader;
+        mTemplateMessageReader = NULL;
         mMessageReader = NULL;
 
-        delete mMessageBuilder;
+        delete mTemplateMessageBuilder;
+        mTemplateMessageBuilder = NULL;
         mMessageBuilder = NULL;
 
+        delete mLLSDMessageReader;
+        mLLSDMessageReader = NULL;
+
         delete mPollInfop;
         mPollInfop = NULL;
 
@@ -2942,17 +2947,19 @@ static LLHTTPNode& messageRootNode()
 }
 
 //static
-void LLMessageSystem::dispatch(const std::string& msg_name,
-                                                                const LLSD& message)
+void LLMessageSystem::dispatch(
+        const std::string& msg_name,
+        const LLSD& message)
 {
         LLPointer<LLSimpleResponse>     responsep =     LLSimpleResponse::create();
         dispatch(msg_name, message, responsep);
 }
 
 //static
-void LLMessageSystem::dispatch(const std::string& msg_name,
-                                                                const LLSD& message,
-                                                           LLHTTPNode::ResponsePtr responsep)
+void LLMessageSystem::dispatch(
+        const std::string& msg_name,
+        const LLSD& message,
+        LLHTTPNode::ResponsePtr responsep)
 {
         if (msg_name.empty())
         {