From 3dbafba55c96a664b1518c97daf856c332b2aa05 Mon Sep 17 00:00:00 2001 From: Anchor <none@none> Date: Sun, 10 Feb 2019 22:48:59 -0800 Subject: [PATCH] [SL-1360] - black skirt fix. reverting change. wearable data doesnt really work for other avatars. made an appearanace service change instead --- indra/newview/llvoavatar.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a962a89e28a..0764e7d72c9 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7464,16 +7464,7 @@ BOOL LLVOAvatar::isWearingWearableType(LLWearableType::EType type) const if (texture_dict->mIsUsedByBakedTexture) { const EBakedTextureIndex baked_index = texture_dict->mBakedTextureIndex; - - if (type == LLWearableType::WT_SKIRT) - { - return (LLAvatarAppearance::isWearingWearableType(type) && isTextureDefined(LLAvatarAppearanceDictionary::getInstance()->getBakedTexture(baked_index)->mTextureIndex)); - } - else - { - return isTextureDefined(LLAvatarAppearanceDictionary::getInstance()->getBakedTexture(baked_index)->mTextureIndex); - } - + return isTextureDefined(LLAvatarAppearanceDictionary::getInstance()->getBakedTexture(baked_index)->mTextureIndex); } return FALSE; } -- GitLab