Second Life viewer sources 1.21.0-RC

1 files changed, 3 insertions, 5 deletions

diff --git a/linden/indra/llcharacter/llkeyframemotionparam.cpp b/linden/indra/llcharacter/llkeyframemotionparam.cpp
index 0e7388c..c22ef26 100644
--- a/linden/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/linden/indra/llcharacter/llkeyframemotionparam.cpp
@@ -346,10 +346,8 @@ BOOL LLKeyframeMotionParam::loadMotions()
         // Load named file by concatenating the character prefix with the motion name.
         // Load data into a buffer to be parsed.
         //-------------------------------------------------------------------------
-        char path[LL_MAX_PATH];         /* Flawfinder: ignore */
-        snprintf( path,sizeof(path), "%s_%s.llp",
-                gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()).c_str(),
-                getName().c_str() );    
+        std::string path = gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix())
+                + "_" + getName() + ".llp";
 
         //-------------------------------------------------------------------------
         // open the file
@@ -436,7 +434,7 @@ BOOL LLKeyframeMotionParam::loadMotions()
                         return FALSE;
                 }
 
-                addKeyframeMotion(strA, gAnimLibrary.stringToAnimState(strA), strB, floatA);
+                addKeyframeMotion(strA, gAnimLibrary.stringToAnimState(std::string(strA)), strB, floatA);
                 if (isFirstMotion)
                 {
                         isFirstMotion = FALSE;