diff options
| author | Tofu Buzzard <no-email> | 2011-03-14 18:18:20 -0700 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-14 18:18:20 -0700 |
| commit | ea5cbe9c90afdab366e7db7469a895f45c8746f0 (patch) | |
| tree | 2d99aad3fd4161ad091704a0a1083513d5d60d95 /indra/newview/llviewerobjectlist.cpp | |
| parent | 41f057b693d1b2b1b1916e3a126dc622a943e5d8 (diff) | |
| parent | 16ff50719055aae202011e4b20aeae41d98493fa (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 ; |