From 53e6a53200325454640f4471120fc14f5a0eb848 Mon Sep 17 00:00:00 2001
From: Cinder Biscuits <cinder@cinderblocks.biz>
Date: Sat, 17 Aug 2019 15:34:43 -0500
Subject: [PATCH] Orphaned iterator
---
indra/newview/pipeline.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index cf716953b8..2ddb0fc127 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3903,10 +3903,10 @@ void LLPipeline::postSort(LLCamera& camera)
}
} func;
- if (!mSelectedFaces.empty())
- {
- LLPipeline::setRenderHighlightTextureChannel(gFloaterTools->getPanelFace()->getTextureChannelToEdit());
- }
+ if (!mSelectedFaces.empty())
+ {
+ LLPipeline::setRenderHighlightTextureChannel(gFloaterTools->getPanelFace()->getTextureChannelToEdit());
+ }
LLSelectMgr::getInstance()->getSelection()->applyToTEs(&func);
}
}
@@ -10688,7 +10688,6 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
markVisible(avatar->mDrawable, *viewer_camera);
LLVOAvatar::sUseImpostors = false; // @TODO ???
- LLVOAvatar::attachment_map_t::iterator iter;
for (const auto& attach_pair : avatar->mAttachmentPoints)
{
for (LLViewerObject* attached_object : attach_pair.second->mAttachedObjects)
--
GitLab