diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:16:24 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:16:24 +0000 |
| commit | b1964a47005d7bbd99258af7f4eaf4b12baeb423 (patch) | |
| tree | 8e27a7cb161f6e24439a772c5bcfdd4a3ee6f83a /indra/newview/llviewerinventory.cpp | |
| parent | e914f3e4a11ff86b3e05089c9b3a6677ec623c9c (diff) | |
| parent | 17f71efce08ed4e677b497f4734d6f9f1fef56a3 (diff) | |
Merged in DV528-merge-6.5.1 (pull request #774)
DRTVWR-528 merge up to 6.5.1
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index bbed741a33..55ac817479 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -1756,7 +1756,7 @@ void menu_create_inventory_item(LLInventoryPanel* panel, LLFolderBridge *bridge, else { // Use for all clothing and body parts. Adding new wearable types requires updating LLWearableDictionary. - LLWearableType::EType wearable_type = LLWearableType::typeNameToType(type_name); + LLWearableType::EType wearable_type = LLWearableType::getInstance()->typeNameToType(type_name); if (wearable_type >= LLWearableType::WT_SHAPE && wearable_type < LLWearableType::WT_COUNT) { const LLUUID parent_id = bridge ? bridge->getUUID() : LLUUID::null; |