diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:38 -0400 |
| commit | ae3e97024ec60d2c0555bf01ff6e2786232b6dd5 (patch) | |
| tree | c3469e40b8ae0edc3b8695a346942d3897666115 /indra/newview/llviewerobjectlist.cpp | |
| parent | 845405cce6e432c60f1733e7b8d529682a107a86 (diff) | |
| parent | 2c0f97ea392e770cc459b7b7974e9adad2249c87 (diff) | |
merge changes for storm-1021
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 81479e8b49..979d91cfcb 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1180,6 +1180,7 @@ void LLViewerObjectList::clearAllMapObjectsInRegion(LLViewerRegion* regionp) } } + void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap) { LLColor4 above_water_color = LLUIColorTable::instance().getColor( "NetMapOtherOwnAboveWater" ); @@ -1199,7 +1200,6 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap) { LLViewerObject* objectp = *iter; - //llassert_always(!objectp->isDead()); if(objectp->isDead())//some dead objects somehow not cleaned. { continue ; |