diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-03-07 18:10:28 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-03-07 18:10:28 -0700 |
| commit | ec6092c3210e19e92f9309abcf25de95dbd4346a (patch) | |
| tree | e08a50815bbdc5a3a6e8015034d7f9def0e41834 /indra/newview/llviewerobjectlist.h | |
| parent | e64096da697d57d5b00f79ecda649ed76d4a70ba (diff) | |
fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion
STORM-1014: Viewer crash in LLSurface::getWaterHeight
STORM-1047:[crashhunters] crash at LLViewerObjectList::renderObjectsForMap
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; |