aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerobjectlist.h5
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:
182 const U32 ip, 182 const U32 ip,
183 const U32 port); // Requires knowledge of message system info! 183 const U32 port); // Requires knowledge of message system info!
184 184
185 static BOOL removeFromLocalIDTable(const LLViewerObject &object); 185 static BOOL removeFromLocalIDTable(const LLViewerObject* objectp);
186 // Used ONLY by the orphaned object code. 186 // Used ONLY by the orphaned object code.
187 static U64 getIndex(const U32 local_id, const U32 ip, const U32 port); 187 static U64 getIndex(const U32 local_id, const U32 ip, const U32 port);
188 188
@@ -200,8 +200,7 @@ protected:
200 200
201 LLDynamicArrayPtr<LLPointer<LLViewerObject> > mMapObjects; 201 LLDynamicArrayPtr<LLPointer<LLViewerObject> > mMapObjects;
202 202
203 typedef std::map<LLUUID, LLPointer<LLViewerObject> > vo_map; 203 std::set<LLUUID> mDeadObjects;
204 vo_map mDeadObjects; // Need to keep multiple entries per UUID
205 204
206 std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap; 205 std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
207 206