diff options
| author | Karen Clark <karen@lindenlab.com> | 2007-03-20 22:21:42 +0000 |
|---|---|---|
| committer | Karen Clark <karen@lindenlab.com> | 2007-03-20 22:21:42 +0000 |
| commit | fceae96eb171be0396512e251aab311d4e3ef9cc (patch) | |
| tree | e648d1dd42aeae4d47168bd8d696ff0895819b8b /indra/llcharacter/llkeyframemotionparam.cpp | |
| parent | 5e9e67cb2d1d3dfc82dfe96103270b2341991ddd (diff) | |
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
Diffstat (limited to 'indra/llcharacter/llkeyframemotionparam.cpp')
| -rw-r--r-- | indra/llcharacter/llkeyframemotionparam.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp index 40ec4bde35..a4d61c35c5 100644 --- a/indra/llcharacter/llkeyframemotionparam.cpp +++ b/indra/llcharacter/llkeyframemotionparam.cpp @@ -329,7 +329,7 @@ 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", /* Flawfinder: ignore */ + snprintf( path,sizeof(path), "%s_%s.llp", gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()).c_str(), getName().c_str() ); |