diff options
| author | Tofu Buzzard <no-email> | 2011-03-14 18:18:33 -0700 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-14 18:18:33 -0700 |
| commit | 2d29b51f648e8a006936e9e70cf955b7e493bdfe (patch) | |
| tree | 966345babfafb4423e71956a944a8d858b292294 /indra/newview/llviewerobjectlist.cpp | |
| parent | 0b51a0cc63b5d6cd848189bf3fc0d26e987c62fb (diff) | |
| parent | ea5cbe9c90afdab366e7db7469a895f45c8746f0 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 1aa9987fd9..0071753831 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1546,6 +1546,7 @@ void LLViewerObjectList::clearAllMapObjectsInRegion(LLViewerRegion* regionp) } } + void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap) { LLColor4 above_water_color = LLUIColorTable::instance().getColor( "NetMapOtherOwnAboveWater" ); @@ -1565,7 +1566,6 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap) { LLViewerObject* objectp = *iter; - //llassert_always(!objectp->isDead()); if(objectp->isDead())//some dead objects somehow not cleaned. { continue ; |