diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index e0b9c5a591..87cb66cfdb 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -252,12 +252,20 @@ void LLAvatarAppearance::initInstance() // Skip it if there's no associated baked texture. if (baked_texture_index == BAKED_NUM_INDICES) continue; - for (avatar_joint_mesh_list_t::iterator iter = mMeshLOD[mesh_index]->mMeshParts.begin(); - iter != mMeshLOD[mesh_index]->mMeshParts.end(); - ++iter) + // FIRE-11915: Variable redefinition + //for (avatar_joint_mesh_list_t::iterator iter = mMeshLOD[mesh_index]->mMeshParts.begin(); + // iter != mMeshLOD[mesh_index]->mMeshParts.end(); + // ++iter) + //{ + // LLAvatarJointMesh* mesh = (*iter); + // mBakedTextureDatas[(int)baked_texture_index].mJointMeshes.push_back(mesh); + for (avatar_joint_mesh_list_t::iterator ajm_iter = mMeshLOD[mesh_index]->mMeshParts.begin(); + ajm_iter != mMeshLOD[mesh_index]->mMeshParts.end(); + ++ajm_iter) { - LLAvatarJointMesh* mesh = (*iter); - mBakedTextureDatas[(int)baked_texture_index].mJointMeshes.push_back(mesh); + LLAvatarJointMesh* mesh = (*ajm_iter); + mBakedTextureDatas[(S32)baked_texture_index].mJointMeshes.push_back(mesh); + // FIRE-11915: Variable redefinition } }