diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2019-12-16 12:47:19 -0700 |
| commit | f61a5c4642db8af5d80eacc0ca7a2062bf08e4f0 (patch) | |
| tree | e644e1db27f9ea9043d4adeeafc3da5ebdd8e211 /indra/newview/pipeline.cpp | |
| parent | bc06a9acf91035903d497bdd66e9bb26859616be (diff) | |
| parent | d656d49a77eeb65ae537c954ea4009bc22da7b2b (diff) | |
Merge viewer-release 6.3.6 into viewwer-eep repo
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 2770844d80..e54bfcd911 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -10960,7 +10960,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar) attachment_iter != attachment->mAttachedObjects.end(); ++attachment_iter) { - if (LLViewerObject* attached_object = (*attachment_iter)) + if (LLViewerObject* attached_object = attachment_iter->get()) { markVisible(attached_object->mDrawable->getSpatialBridge(), *viewer_camera); } |