diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/llcharacter/llkeyframemotionparam.cpp | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/llcharacter/llkeyframemotionparam.cpp')
| -rw-r--r-- | indra/llcharacter/llkeyframemotionparam.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp index 622405a5e1..c4333fc0fd 100644 --- a/indra/llcharacter/llkeyframemotionparam.cpp +++ b/indra/llcharacter/llkeyframemotionparam.cpp @@ -347,8 +347,11 @@ BOOL LLKeyframeMotionParam::loadMotions() // Load named file by concatenating the character prefix with the motion name. // Load data into a buffer to be parsed. //------------------------------------------------------------------------- - std::string path = gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()) - + "_" + getName() + ".llp"; + //std::string path = gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix()) + // + "_" + getName() + ".llp"; + //RN: deprecated unused reference to "motion" directory + std::string path; + //------------------------------------------------------------------------- // open the file |