diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
| commit | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (patch) | |
| tree | ab3877f764cc27dbdca0b683f07e6ea3a3ac8a23 /indra/llmessage/llmessageconfig.cpp | |
| parent | 7b61f1d0ec30e97fd3b7c5caf4b0e675c6e9a1f5 (diff) | |
merge -r61423:62602 svn/branches/maintenance --> release
Diffstat (limited to 'indra/llmessage/llmessageconfig.cpp')
| -rw-r--r-- | indra/llmessage/llmessageconfig.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmessage/llmessageconfig.cpp b/indra/llmessage/llmessageconfig.cpp index a2b0bc5efa..3cc17d67df 100644 --- a/indra/llmessage/llmessageconfig.cpp +++ b/indra/llmessage/llmessageconfig.cpp @@ -92,9 +92,10 @@ void LLMessageConfigFile::loadServerDefaults(const LLSD& data) void LLMessageConfigFile::loadMessages(const LLSD& data) { - mMessages = data["messages"]; + LLPointer<LLSDXMLFormatter> formatter = new LLSDXMLFormatter; std::ostringstream out; - LLSDXMLFormatter *formatter = new LLSDXMLFormatter; + + mMessages = data["messages"]; formatter->format(mMessages, out); lldebugs << "loading ... " << out.str() << " LLMessageConfigFile::loadMessages loaded " |