summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2025-08-27 01:42:36 +0300
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-08-27 16:09:14 +0300
commit0fc42e951f99182b080c7187455d6a4da602441b (patch)
tree2026a2397a75861cda70317017b2dfbaaf7783c4
parent8a585912adab1948e250c30d8ceb3588b9148600 (diff)
#4608 Crash at LLJoint::findJoint
'this' is null inside findJoint according to bugsplat so likely mRoot was not initialized yet.
-rw-r--r--indra/newview/llmeshrepository.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 9e8ed3bb43..997fc28333 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2460,7 +2460,7 @@ bool LLMeshRepoThread::skinInfoReceived(const LLUUID& mesh_id, U8* data, S32 dat
LLPointer<LLMeshSkinInfo> info = nullptr;
info = new LLMeshSkinInfo(mesh_id, skin);
- if (isAgentAvatarValid())
+ if (isAgentAvatarValid() && gAgentAvatarp->mInitFlags != 0)
{ // joint numbers are consistent inside LLVOAvatar and animations, but inconsistent inside meshes,
// generate a map of mesh joint numbers to LLVOAvatar joint numbers
LLSkinningUtil::initJointNums(info, gAgentAvatarp);