diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:58:21 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-11-16 18:58:21 +0000 |
commit | f2f7034f2d358886ddb4137a7b5ab3c3f5717a4f (patch) | |
tree | f5098b9532f6d7b757b9a8fb345e7aa5e7e69108 /indra/llappearance/llviewervisualparam.cpp | |
parent | e95b7efd0b4469ce18bce3bc0261ecc9be06ea9c (diff) | |
parent | 353329c2c2e9e8fa1ff273de2016c9e155585f45 (diff) |
Merged in DV546-merge-6.5.1 (pull request #776)
DRTVWR-546 merge up to 6.5.1
Diffstat (limited to 'indra/llappearance/llviewervisualparam.cpp')
-rw-r--r-- | indra/llappearance/llviewervisualparam.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/llviewervisualparam.cpp b/indra/llappearance/llviewervisualparam.cpp index af8394b60c..fb0d12f0af 100644 --- a/indra/llappearance/llviewervisualparam.cpp +++ b/indra/llappearance/llviewervisualparam.cpp @@ -70,7 +70,7 @@ BOOL LLViewerVisualParamInfo::parseXml(LLXmlTreeNode *node) static LLStdStringHandle wearable_string = LLXmlTree::addAttributeString("wearable"); if( node->getFastAttributeString( wearable_string, wearable) ) { - mWearableType = LLWearableType::typeNameToType( wearable ); + mWearableType = LLWearableType::getInstance()->typeNameToType( wearable ); } static LLStdStringHandle edit_group_string = LLXmlTree::addAttributeString("edit_group"); |