diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:45:17 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:45:17 +0200 |
| commit | 098c4c0371f63b2b827131a13bfc623b8cb73f25 (patch) | |
| tree | 778bd8bc6f9a557fed93e040ea58c0b73bea0dbb /indra/llappearance/llwearable.cpp | |
| parent | d734105446182b17a91f6590eaa23ac690032817 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-486
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelvolume.h
Diffstat (limited to 'indra/llappearance/llwearable.cpp')
| -rw-r--r-- | indra/llappearance/llwearable.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp index 28a36e6e41..e4bc8ff427 100644 --- a/indra/llappearance/llwearable.cpp +++ b/indra/llappearance/llwearable.cpp @@ -73,17 +73,17 @@ LLWearable::~LLWearable() const std::string& LLWearable::getTypeLabel() const { - return LLWearableType::getTypeLabel(mType); + return LLWearableType::getInstance()->getTypeLabel(mType); } const std::string& LLWearable::getTypeName() const { - return LLWearableType::getTypeName(mType); + return LLWearableType::getInstance()->getTypeName(mType); } LLAssetType::EType LLWearable::getAssetType() const { - return LLWearableType::getAssetType(mType); + return LLWearableType::getInstance()->getAssetType(mType); } BOOL LLWearable::exportFile(const std::string& filename) const |