diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-10 13:40:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-10 13:40:36 -0500 |
| commit | 57c5d474013793f622ac77a139251a54b056cb00 (patch) | |
| tree | 8cd490d3bb86e74bfcd701ee400bccda74791629 /indra/newview/llviewerobjectlist.h | |
| parent | d3ca4983a4526c7fcf9eb9609e007ded74c47c05 (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
pull 2.5.1 tag back from viewer-release
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rw-r--r-- | indra/newview/llviewerobjectlist.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 8cff8e988a..22a7f97c38 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -88,6 +88,7 @@ public: void shiftObjects(const LLVector3 &offset); bool hasMapObjectInRegion(LLViewerRegion* regionp) ; + void clearAllMapObjectsInRegion(LLViewerRegion* regionp) ; void renderObjectsForMap(LLNetMap &netmap); void renderObjectBounds(const LLVector3 ¢er); @@ -181,8 +182,7 @@ protected: vobj_list_t 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; |