1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index dfc18e0b2e..a305797fd2 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -1324,12 +1324,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;