From 6e186befad1eafd091a38c9e4d6b58cc09926e57 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 17 Jul 2025 11:23:10 +0300
Subject: Reapply "Merge develop into glTF mesh import"

To simplify merging into mesh import branch
This reverts commit b0c951ffe348f478f27a85720cc7aeffea32fe73.
---
 indra/newview/llvoavatarself.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index ebba9ba291..90ff4067f2 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -697,17 +697,17 @@ void LLVOAvatarSelf::idleUpdate(LLAgent &agent, const F64 &time)
 }
 
 // virtual
-LLJoint* LLVOAvatarSelf::getJoint(std::string_view name)
+LLJoint *LLVOAvatarSelf::getJoint(const std::string &name)
 {
     std::lock_guard lock(mJointMapMutex);
-    LLJoint* jointp = nullptr;
+    LLJoint *jointp = NULL;
     jointp = LLVOAvatar::getJoint(name);
     if (!jointp && mScreenp)
     {
         jointp = mScreenp->findJoint(name);
         if (jointp)
         {
-            mJointMap[std::string(name)] = jointp;
+            mJointMap[name] = jointp;
         }
     }
     if (jointp && jointp != mScreenp && jointp != mRoot)
-- 
cgit v1.2.3