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/llcharacter/llcharacter.cpp | |
| parent | f48fe44684a535ed2eefc64c134551ce72e9ecf4 (diff) | |
Revert "Merge develop into glTF mesh import"
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); } |