livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-11915: Fix variable redefinition; Found by Filomena Firelyte

Ansariel 2013-10-22 19:44:42 +02:00
parent a6e3e80eb5
commit 81d254ddc8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llappearance/llavatarappearance.cpp
View File

@ -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)
// <FS:Ansariel> 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);
// </FS:Ansariel> FIRE-11915: Variable redefinition
}
}