From 2959bcd3de68d6a71f0f09cfa8b95d6fb8c9cdab Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 27 Feb 2012 18:13:06 -0500
Subject: [PATCH] SH-2689 WIP - fix for isFullyTextured when no skirt worn
---
indra/newview/llvoavatar.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index f027429c792..fcb774f0e5c 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.
--
GitLab