diff options
author | Anchor <none@none> | 2019-02-10 22:48:59 -0800 |
---|---|---|
committer | Anchor <none@none> | 2019-02-10 22:48:59 -0800 |
commit | 3dbafba55c96a664b1518c97daf856c332b2aa05 (patch) | |
tree | ca2ae878631955220875b9254b2e2a1fbf3c6f69 /indra | |
parent | 490bdacf588411eb6558df430f788f18a51cc10f (diff) |
[SL-1360] - black skirt fix. reverting change. wearable data doesnt really work for other avatars. made an appearanace service change instead
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llvoavatar.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a962a89e28..0764e7d72c 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; } |