Altered LLIndexedVector. There's zero point to having a lookup map into an array like this. Just iterating down the array is faster than the map lookup (which iterates down a linked list...). A hash map would be a different case entirely.

indra/llmessage/llsdmessagebuilder.cpp

@@ -95,13 +95,6 @@ void LLSDMessageBuilder::nextBlock(const char* blockname)
 	}
 }
 
-// TODO: Remove this horror...
-BOOL LLSDMessageBuilder::removeLastBlock()
-{
-	/* TODO: finish implementing this */
-	return FALSE;
-}
-
 void LLSDMessageBuilder::addBinaryData(
 	const char* varname, 
 	const void* data,
@@ -264,7 +257,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
 		
 		for(; dit != dend; ++dit)
 		{
-			const LLMsgVarData& mvci = *dit;
+			const LLMsgVarData& mvci = dit->second;
 			const char* varname = mvci.getName();
 
 			switch(mvci.getType())