diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-06-27 21:28:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-27 21:28:58 -0400 |
| commit | b0c951ffe348f478f27a85720cc7aeffea32fe73 (patch) | |
| tree | 9e473b5ecbd873062b29d91ee94cc06453e12dd7 /indra/newview/llvoavatar.cpp | |
| parent | f48fe44684a535ed2eefc64c134551ce72e9ecf4 (diff) | |
Revert "Merge develop into glTF mesh import"
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index d9a3ec3004..dcba891f9f 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6306,13 +6306,13 @@ const LLUUID& LLVOAvatar::getID() const // getJoint() //----------------------------------------------------------------------------- // RN: avatar joints are multi-rooted to include screen-based attachments -LLJoint *LLVOAvatar::getJoint( const std::string &name ) +LLJoint* LLVOAvatar::getJoint(std::string_view name) { joint_map_t::iterator iter = mJointMap.find(name); - LLJoint* jointp = NULL; + LLJoint* jointp = nullptr; - if (iter == mJointMap.end() || iter->second == NULL) + if (iter == mJointMap.end() || iter->second == nullptr) { //search for joint and cache found joint in lookup table if (mJointAliasMap.empty()) { @@ -6329,7 +6329,7 @@ LLJoint *LLVOAvatar::getJoint( const std::string &name ) canonical_name = name; } jointp = mRoot->findJoint(canonical_name); - mJointMap[name] = jointp; + mJointMap[std::string(name)] = jointp; } else { //return cached pointer |