diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
| commit | 403d1b6404355fa26b0bfeff206f5c56758a491c (patch) | |
| tree | 6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /indra/newview/pipeline.cpp | |
| parent | 21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff) | |
| parent | 825cc7873251ad90720ab40221d689abed7b2ac8 (diff) | |
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
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 0b98119b19..e874373f9e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1694,6 +1694,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); |