summaryrefslogtreecommitdiff
path: root/indra/newview/llmodelpreview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llmodelpreview.cpp')
-rw-r--r--indra/newview/llmodelpreview.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 40b6d186b8..d6b438a6e2 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -811,7 +811,9 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
else
{
LLVOAvatar* av = getPreviewAvatar();
- LLAvatarAppearance::joint_rest_map_t rest_pose = av->getJointRestMatrices();
+ LLAvatarAppearance::joint_rest_map_t rest_pose;
+ LLAvatarAppearance::joint_parent_map_t rest_parent_map;
+ av->getJointRestMatrices(rest_pose, rest_parent_map);
mModelLoader = new LLGLTFLoader(
filename,
lod,
@@ -825,7 +827,8 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
joint_alias_map,
LLSkinningUtil::getMaxJointCount(),
gSavedSettings.getU32("ImporterModelLimit"),
- rest_pose);
+ rest_pose,
+ rest_parent_map);
}
if (force_disable_slm)