diff options
| author | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
| commit | 70aff7fd157b1e2894a4d065caf9a63848d072b0 (patch) | |
| tree | dee262d1b7ac3ef14eebeb71d55e9b0755209148 /indra/newview/llviewerobjectlist.h | |
| parent | 64e672d9d92d1b8f92e968b0164b2212a71120da (diff) | |
| parent | 378585e7f089b62b7a0dd69adde48cd63fc7bacc (diff) | |
Merge
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; |