diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-15 12:02:58 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-15 12:02:58 -0700 |
| commit | 3f64343b0b078e481c1c852ccd7201be6826a110 (patch) | |
| tree | 8e82154ded91c169702e374d2e293712542805fd /indra/newview/llviewerobjectlist.cpp | |
| parent | fa277a3b4a5d5dc5af6eb53ecd005e4789534758 (diff) | |
| parent | 2c22863888eefbfb0f4245011be989d155583db7 (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 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 ; |