From e6164426caba3ff5b4ed463a27f3243c54d6a55e Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Fri, 3 May 2013 11:10:53 +0200
Subject: [PATCH] Backout 33851 / 33854 to create another automated build with
 just /GS enabled and the objectlist being a std::map again. This way I have
 two installable versions to compare which are exactly the same. Plus the safe
 path (/GS) is restore d as default again.

---
 indra/newview/llviewerobjectlist.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index aa08c3cc86..449a4633ff 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -37,8 +37,6 @@
 // project includes
 #include "llviewerobject.h"
 
-#include <boost/unordered_map.hpp>
-
 class LLCamera;
 class LLNetMap;
 class LLDebugBeacon;
@@ -208,12 +206,7 @@ protected:
 
 	std::set<LLUUID> mDeadObjects;	
 
-	// <FS:ND> mUUIDObjectMap is hit very frequently
-
-	// std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
-	boost::unordered_map<LLUUID, LLPointer<LLViewerObject>, FSUUIDHash> mUUIDObjectMap;
-
-	// </FS:ND>
+	std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
 
 	//set of objects that need to update their cost
 	std::set<LLUUID> mStaleObjectCost;
@@ -269,8 +262,7 @@ extern LLViewerObjectList gObjectList;
  */
 inline LLViewerObject *LLViewerObjectList::findObject(const LLUUID &id)
 {
-	// std::map<LLUUID, LLPointer<LLViewerObject> >::iterator iter = mUUIDObjectMap.find(id);
-	boost::unordered_map<LLUUID, LLPointer<LLViewerObject>, FSUUIDHash>::iterator iter = mUUIDObjectMap.find( id );
+	std::map<LLUUID, LLPointer<LLViewerObject> >::iterator iter = mUUIDObjectMap.find(id);
 	if(iter != mUUIDObjectMap.end())
 	{
 		return iter->second;