svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.

1 files changed, 10 insertions, 2 deletions

diff --git a/indra/llmessage/llmessagetemplate.cpp b/indra/llmessage/llmessagetemplate.cpp
index 026843d6ec..7383308ddd 100644
--- a/indra/llmessage/llmessagetemplate.cpp
+++ b/indra/llmessage/llmessagetemplate.cpp
@@ -1,3 +1,11 @@
+/** 
+ * @file llmessagetemplate.cpp
+ * @brief Implementation of message template classes.
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
 #include "linden_common.h"
 
 #include "llmessagetemplate.h"
@@ -94,7 +102,7 @@ std::ostream& operator<<(std::ostream& s, LLMessageBlock &msg)
 	for (LLMessageBlock::message_variable_map_t::iterator iter = msg.mMemberVariables.begin();
 		 iter != msg.mMemberVariables.end(); iter++)
 	{
-		LLMessageVariable& ci = *(iter->second);
+		LLMessageVariable& ci = *(*iter);
 		s << ci;
 	}
 
@@ -138,7 +146,7 @@ std::ostream& operator<<(std::ostream& s, LLMessageTemplate &msg)
 	for (LLMessageTemplate::message_block_map_t::iterator iter = msg.mMemberBlocks.begin();
 		 iter != msg.mMemberBlocks.end(); iter++)
 	{
-		LLMessageBlock* ci = iter->second;
+		LLMessageBlock* ci = *iter;
 		s << *ci;
 	}