Merge pull request #4306 from secondlife/geenz/develop-to-gltf-mesh

Merge develop into glTF mesh import

1 files changed, 4 insertions, 3 deletions

diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index 8efcd9dd29..ecbcdb3bf5 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -77,11 +77,12 @@ LLCharacter::~LLCharacter()
 //-----------------------------------------------------------------------------
 // getJoint()
 //-----------------------------------------------------------------------------
-LLJoint* LLCharacter::getJoint(std::string_view name)
+LLJoint *LLCharacter::getJoint( const std::string &name )
 {
-    LLJoint* joint = nullptr;
+    LLJoint* joint = NULL;
 
-    if (LLJoint* root = getRootJoint())
+    LLJoint *root = getRootJoint();
+    if (root)
     {
         joint = root->findJoint(name);
     }