diff options
| author | prep <prep@lindenlab.com> | 2011-03-14 16:18:04 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-03-14 16:18:04 -0400 |
| commit | 3559789967513a1f3eecf1bc1ad38d9b073cb296 (patch) | |
| tree | 1c20e0e83924ff013c884ec7a774b19f5837a409 /indra/newview/llviewerobjectlist.cpp | |
| parent | bc54afb907e65ab2d73e1f040551c6191a4a7682 (diff) | |
| parent | 13705596af001078d185dfe5aa7e98d9642f8c8a (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 ; |