diff options
| author | Bennett Goble <signal@lindenlab.com> | 2021-12-11 10:28:35 -0800 |
|---|---|---|
| committer | Bennett Goble <signal@lindenlab.com> | 2021-12-11 10:29:37 -0800 |
| commit | 0b95b9d008a0878b5d57262e529cef61fb29ea24 (patch) | |
| tree | 6e12a7949c9a69a5e1ad170220b4e9a82a453142 /indra/newview/llviewerinventory.cpp | |
| parent | f729cfc33f258781c5fd85a3d8773bf6149d12db (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into SL-15742
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; |