Skip to content

Commit 72cce15

Browse files
committed
Merge remote-tracking branch 'origin/release/2024.12-ForeverFPS' into develop
2 parents c17a903 + 8ed31a7 commit 72cce15

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

indra/llappearance/llavatarappearancedefines.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,8 @@ EBakedTextureIndex LLAvatarAppearanceDictionary::findBakedByImageName(std::strin
300300

301301
LLWearableType::EType LLAvatarAppearanceDictionary::getTEWearableType(ETextureIndex index ) const
302302
{
303-
return getTexture(index)->mWearableType;
303+
auto* tex = getTexture(index);
304+
return tex ? tex->mWearableType : LLWearableType::WT_INVALID;
304305
}
305306

306307
// static

indra/llappearance/llwearable.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ void LLWearable::setVisualParamWeight(S32 param_index, F32 value)
653653
}
654654
else
655655
{
656-
LL_ERRS() << "LLWearable::setVisualParam passed invalid parameter index: " << param_index << " for wearable type: " << this->getName() << LL_ENDL;
656+
LL_WARNS() << "LLWearable::setVisualParam passed invalid parameter index: " << param_index << " for wearable type: " << this->getName() << LL_ENDL;
657657
}
658658
}
659659

@@ -667,7 +667,7 @@ F32 LLWearable::getVisualParamWeight(S32 param_index) const
667667
}
668668
else
669669
{
670-
LL_WARNS() << "LLWerable::getVisualParam passed invalid parameter index: " << param_index << " for wearable type: " << this->getName() << LL_ENDL;
670+
LL_WARNS() << "LLWearable::getVisualParam passed invalid parameter index: " << param_index << " for wearable type: " << this->getName() << LL_ENDL;
671671
}
672672
return (F32)-1.0;
673673
}

0 commit comments

Comments
 (0)