diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-02 17:28:58 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-02 17:28:58 +0000 |
| commit | 305c74d5163c5e344a675d39ca2394a9e45bd2c2 (patch) | |
| tree | 42836c4a6010b2b015156024d3cfb6bf64a48ad6 /indra/llcharacter/llkeyframemotionparam.cpp | |
| parent | 54d89549df38bb61881583a3eb8d3645c107d79f (diff) | |
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
Diffstat (limited to 'indra/llcharacter/llkeyframemotionparam.cpp')
| -rw-r--r-- | indra/llcharacter/llkeyframemotionparam.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp index c57079fc2b..40ec4bde35 100644 --- a/indra/llcharacter/llkeyframemotionparam.cpp +++ b/indra/llcharacter/llkeyframemotionparam.cpp @@ -329,9 +329,9 @@ BOOL LLKeyframeMotionParam::loadMotions() // Load data into a buffer to be parsed. //------------------------------------------------------------------------- char path[LL_MAX_PATH]; /* Flawfinder: ignore */ - snprintf( path, sizeof(path), "%s_%s.llp", + snprintf( path,sizeof(path), "%s_%s.llp", /* Flawfinder: ignore */ gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()).c_str(), - getName().c_str() ); /* Flawfinder: ignore */ + getName().c_str() ); //------------------------------------------------------------------------- // open the file @@ -406,7 +406,7 @@ BOOL LLKeyframeMotionParam::loadMotions() // get priority //------------------------------------------------------------------------- BOOL isFirstMotion = TRUE; - num = sscanf(p, "%79s %79s %f", strA, strB, &floatA); + num = sscanf(p, "%79s %79s %f", strA, strB, &floatA); /* Flawfinder: ignore */ while(1) { @@ -432,7 +432,7 @@ BOOL LLKeyframeMotionParam::loadMotions() } p++; - num = sscanf(p, "%79s %79s %f", strA, strB, &floatA); + num = sscanf(p, "%79s %79s %f", strA, strB, &floatA); /* Flawfinder: ignore */ } delete [] text; |