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/newview/llviewerwearable.cpp | |
parent | e914f3e4a11ff86b3e05089c9b3a6677ec623c9c (diff) | |
parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) |
Merge branch 'master' v6.5.1 into DRTVWR-528
Diffstat (limited to 'indra/newview/llviewerwearable.cpp')
-rw-r--r-- | indra/newview/llviewerwearable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp index 9c4dfd1ca2..c80cf27bda 100644 --- a/indra/newview/llviewerwearable.cpp +++ b/indra/newview/llviewerwearable.cpp @@ -562,7 +562,7 @@ void LLViewerWearable::saveNewAsset() const void LLViewerWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void* userdata, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed) { LLWearableSaveData* data = (LLWearableSaveData*)userdata; - const std::string& type_name = LLWearableType::getTypeName(data->mType); + const std::string& type_name = LLWearableType::getInstance()->getTypeName(data->mType); if(0 == status) { // Success @@ -588,7 +588,7 @@ void LLViewerWearable::onSaveNewAssetComplete(const LLUUID& new_asset_id, void* std::ostream& operator<<(std::ostream &s, const LLViewerWearable &w) { - s << "wearable " << LLWearableType::getTypeName(w.mType) << "\n"; + s << "wearable " << LLWearableType::getInstance()->getTypeName(w.mType) << "\n"; s << " Name: " << w.mName << "\n"; s << " Desc: " << w.mDescription << "\n"; //w.mPermissions |