Fix LLCharacter base class constness.

2 files changed, 5 insertions, 4 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);
     }
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index 0046c5da7e..6143ec8cd1 100644
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -76,7 +76,7 @@ public:
     // get the specified joint
     // default implementation does recursive search,
     // subclasses may optimize/cache results.
-    virtual LLJoint* getJoint(std::string_view name);
+    virtual LLJoint *getJoint( const std::string &name );
 
     // get the position of the character
     virtual LLVector3 getCharacterPosition() = 0;