From 54660c8931593ceb465605acf872d5227e1d2d63 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 13 Jun 2025 18:33:49 +0300
Subject: #4147 Joint Overrides #3

Remande skeleton translation from default skeleton to overriden skeleton
---
 indra/newview/llmodelpreview.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llmodelpreview.cpp')

diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index d6b438a6e2..fc0a3ec58f 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -40,6 +40,7 @@
 #include "lldrawable.h"
 #include "llface.h"
 #include "lliconctrl.h"
+#include "lljointdata.h"
 #include "llmatrix4a.h"
 #include "llmeshrepository.h"
 #include "llmeshoptimizer.h"
@@ -811,9 +812,8 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
     else
     {
         LLVOAvatar* av = getPreviewAvatar();
-        LLAvatarAppearance::joint_rest_map_t rest_pose;
-        LLAvatarAppearance::joint_parent_map_t rest_parent_map;
-        av->getJointRestMatrices(rest_pose, rest_parent_map);
+        std::vector<LLJointData> viewer_skeleton;
+        av->getJointMatricesAndHierarhy(viewer_skeleton);
         mModelLoader = new LLGLTFLoader(
             filename,
             lod,
@@ -827,8 +827,7 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
             joint_alias_map,
             LLSkinningUtil::getMaxJointCount(),
             gSavedSettings.getU32("ImporterModelLimit"),
-            rest_pose,
-            rest_parent_map);
+            viewer_skeleton);
     }
 
     if (force_disable_slm)
-- 
cgit v1.2.3