diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-22 08:46:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-22 08:46:19 -0400 |
| commit | 63d04204a99802d3200452e101d9bb1b898be881 (patch) | |
| tree | 457b4b2336afd03f982ff04b7340ec5cb8dfcda4 /indra/newview/pipeline.cpp | |
| parent | 5949d605d757c97819b7b55d1860d36031a3d38f (diff) | |
| parent | e0f391df2a95192130bdfeb0d4f03ad6ca489eef (diff) | |
merge changes for DRTVWR-203
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 75eb8c460e..920bac93a2 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1680,6 +1680,21 @@ void LLPipeline::unlinkDrawable(LLDrawable *drawable) } +//static +void LLPipeline::removeMutedAVsLights(LLVOAvatar* muted_avatar) +{ + LLFastTimer t(FTM_REMOVE_FROM_LIGHT_SET); + for (light_set_t::iterator iter = gPipeline.mNearbyLights.begin(); + iter != gPipeline.mNearbyLights.end(); iter++) + { + if (iter->drawable->getVObj()->isAttachment() && iter->drawable->getVObj()->getAvatar() == muted_avatar) + { + gPipeline.mLights.erase(iter->drawable); + gPipeline.mNearbyLights.erase(iter); + } + } +} + U32 LLPipeline::addObject(LLViewerObject *vobj) { LLMemType mt_ao(LLMemType::MTYPE_PIPELINE_ADD_OBJECT); |