diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-27 18:13:06 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-27 18:13:06 -0500 |
| commit | 2959bcd3de68d6a71f0f09cfa8b95d6fb8c9cdab (patch) | |
| tree | 95525c84f8b0da14936ddc390558381dabf13220 | |
| parent | 55b5d6b7b45e956d6927461d8a0ef153ec3c7770 (diff) | |
SH-2689 WIP - fix for isFullyTextured when no skirt worn
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f027429c79..fcb774f0e5 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -904,10 +904,13 @@ BOOL LLVOAvatar::isFullyBaked() BOOL LLVOAvatar::isFullyTextured() const { - for (std::vector<LLViewerJoint*>::const_iterator jointIter = mMeshLOD.begin(); - jointIter != mMeshLOD.end(); ++jointIter) + for (S32 i = 0; i < mMeshLOD.size(); i++) { - LLViewerJoint* joint = (LLViewerJoint*) *jointIter; + LLViewerJoint* joint = (LLViewerJoint*) mMeshLOD[i]; + if (i==MESH_ID_SKIRT && !isWearingWearableType(LLWearableType::WT_SKIRT)) + { + continue; // don't care about skirt textures if we're not wearing one. + } if (!joint) { continue; // nonexistent LOD OK. |