summaryrefslogtreecommitdiff
path: root/indra/llmessage/message.cpp
diff options
context:
space:
mode:
authorKelly Washington <kelly@lindenlab.com>2007-05-30 17:39:09 +0000
committerKelly Washington <kelly@lindenlab.com>2007-05-30 17:39:09 +0000
commit3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (patch)
treeab3877f764cc27dbdca0b683f07e6ea3a3ac8a23 /indra/llmessage/message.cpp
parent7b61f1d0ec30e97fd3b7c5caf4b0e675c6e9a1f5 (diff)
merge -r61423:62602 svn/branches/maintenance --> release
Diffstat (limited to 'indra/llmessage/message.cpp')
-rw-r--r--indra/llmessage/message.cpp9
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;