livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Nicky 2013-05-03 11:10:53 +02:00
parent 2358cb0270
commit e6164426ca
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llviewerobjectlist.h
View File

@ -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;