diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:24:42 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-08 07:24:42 +0800 |
| commit | 73fdef6693017f1160875d1f7a79875945df3929 (patch) | |
| tree | 4d68801d232b579d03fef2306c53637f7498df45 /indra/llcharacter/llcharacter.cpp | |
| parent | 3b776461127f193298018cbe1bbeb92478cca485 (diff) | |
| parent | bfefc01a7baefa6377216ff236be6113c46fa879 (diff) | |
Merge branch '2025.05' into 2025.06
Diffstat (limited to 'indra/llcharacter/llcharacter.cpp')
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index ecbcdb3bf5..8efcd9dd29 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -77,12 +77,11 @@ LLCharacter::~LLCharacter() //----------------------------------------------------------------------------- // getJoint() //----------------------------------------------------------------------------- -LLJoint *LLCharacter::getJoint( const std::string &name ) +LLJoint* LLCharacter::getJoint(std::string_view name) { - LLJoint* joint = NULL; + LLJoint* joint = nullptr; - LLJoint *root = getRootJoint(); - if (root) + if (LLJoint* root = getRootJoint()) { joint = root->findJoint(name); } |