diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 10:23:04 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-11-16 10:23:04 -0700 |
| commit | 17f71efce08ed4e677b497f4734d6f9f1fef56a3 (patch) | |
| tree | 8e27a7cb161f6e24439a772c5bcfdd4a3ee6f83a /indra/llappearance/llwearabledata.cpp | |
| parent | e914f3e4a11ff86b3e05089c9b3a6677ec623c9c (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' v6.5.1 into DRTVWR-528
Diffstat (limited to 'indra/llappearance/llwearabledata.cpp')
| -rw-r--r-- | indra/llappearance/llwearabledata.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp index 66cc4f3766..0eaeedb6ee 100644 --- a/indra/llappearance/llwearabledata.cpp +++ b/indra/llappearance/llwearabledata.cpp @@ -231,10 +231,11 @@ BOOL LLWearableData::getWearableIndex(const LLWearable *wearable, U32& index_fou U32 LLWearableData::getClothingLayerCount() const { U32 count = 0; + LLWearableType *wr_inst = LLWearableType::getInstance(); for (S32 i = 0; i < LLWearableType::WT_COUNT; i++) { LLWearableType::EType type = (LLWearableType::EType)i; - if (LLWearableType::getAssetType(type)==LLAssetType::AT_CLOTHING) + if (wr_inst->getAssetType(type)==LLAssetType::AT_CLOTHING) { count += getWearableCount(type); } @@ -244,7 +245,7 @@ U32 LLWearableData::getClothingLayerCount() const BOOL LLWearableData::canAddWearable(const LLWearableType::EType type) const { - LLAssetType::EType a_type = LLWearableType::getAssetType(type); + LLAssetType::EType a_type = LLWearableType::getInstance()->getAssetType(type); if (a_type==LLAssetType::AT_CLOTHING) { return (getClothingLayerCount() < MAX_CLOTHING_LAYERS); |