diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-09 21:17:29 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-09 21:17:29 -0800 |
| commit | 18a66fb7618c80108d224c9b1c3ff14cc5f3a87f (patch) | |
| tree | 6ff3da645b7d076f4dee2538c6d596e681c90a90 /indra/newview/llviewerobjectlist.h | |
| parent | 7f42c02cad9dbd068bc49bed4b6cd18fd8fff606 (diff) | |
| parent | 0c02401498521f87d38778df0e795960aa5445e1 (diff) | |
Pull from viewer-development
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; |