Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

1 files changed, 2 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.h b/linden/indra/newview/llviewerobjectlist.h
index 07920cb..5999da3 100644
--- a/linden/indra/newview/llviewerobjectlist.h
+++ b/linden/indra/newview/llviewerobjectlist.h
@@ -182,7 +182,7 @@ public:
                                                                 const U32 ip,
                                                                 const U32 port); // Requires knowledge of message system info!
 
-        static BOOL removeFromLocalIDTable(const LLViewerObject &object);
+        static BOOL removeFromLocalIDTable(const LLViewerObject* objectp);
         // Used ONLY by the orphaned object code.
         static U64 getIndex(const U32 local_id, const U32 ip, const U32 port);
 
@@ -200,8 +200,7 @@ protected:
 
         LLDynamicArrayPtr<LLPointer<LLViewerObject> > mMapObjects;
 
-        typedef std::map<LLUUID, LLPointer<LLViewerObject> > vo_map;
-        vo_map mDeadObjects;    // Need to keep multiple entries per UUID
+        std::set<LLUUID> mDeadObjects;
 
         std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;