summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-12 02:37:15 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-12 02:37:15 +0200
commit5f731d84cb5823bdc4cae5be288f2de2ffb9f5f9 (patch)
tree04ddffec7d5a004150aefd5fdbf247863e2a8926 /indra/newview/pipeline.cpp
parent4aa9dfec746f28696a195fe81aed9b6ef0791954 (diff)
parente96d0d5e304324e6ab0c469773fb7110a65fc3f1 (diff)
Downstream merge from 494-maint-wassail
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index eb2d3bf873..e28272e10b 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -11434,7 +11434,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);
}