Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an alignment issue with LLAvatarJointCollisionVolume array. Thanks Henri.

Browse Source
This commit is contained in:
Shyotl
2014-09-07 15:55:53 -05:00
parent e62ef91404
commit f38754d0d6
4 changed files with 164 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llappearance/llpolymorph.cpp
View File

@@ -647,11 +647,11 @@ BOOL LLPolyMorphTarget::setInfo(LLPolyMorphTargetInfo* info)
for (iter = getInfo()->mVolumeInfoList.begin(); iter != getInfo()->mVolumeInfoList.end(); iter++)
{
LLPolyVolumeMorphInfo *volume_info = &(*iter);
for (S32 i = 0; i < avatarp->mNumCollisionVolumes; i++)
for (S32 i = 0; i < (S32)avatarp->mCollisionVolumes.size(); i++)
{
if (avatarp->mCollisionVolumes[i].getName() == volume_info->mName)
if (avatarp->mCollisionVolumes[i]->getName() == volume_info->mName)
{
mVolumeMorphs.push_back(LLPolyVolumeMorph(&avatarp->mCollisionVolumes[i],
mVolumeMorphs.push_back(LLPolyVolumeMorph(avatarp->mCollisionVolumes[i],
volume_info->mScale,
volume_info->mPos));
break;