summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llkeyframemotionparam.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2011-10-28 11:01:11 -0700
committercallum <none@none>2011-10-28 11:01:11 -0700
commitb94f45db81fa6a4625d58301a13f964996fa65bd (patch)
tree1c9134e08ce22f4e122c48e3a746259a8f7ef470 /indra/llcharacter/llkeyframemotionparam.cpp
parentd08d018323272866b189979d0e772d50cdece4b2 (diff)
parentf84a69a7e00f0eed49894e14336126849a9e7b29 (diff)
Merge with head
Diffstat (limited to 'indra/llcharacter/llkeyframemotionparam.cpp')
-rw-r--r--indra/llcharacter/llkeyframemotionparam.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp
index c3d5dec875..82fe8971f5 100644
--- a/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/indra/llcharacter/llkeyframemotionparam.cpp
@@ -351,7 +351,8 @@ BOOL LLKeyframeMotionParam::loadMotions()
// open the file
//-------------------------------------------------------------------------
S32 fileSize = 0;
- LLAPRFile infile(path, LL_APR_R, &fileSize);
+ LLAPRFile infile ;
+ infile.open(path, LL_APR_R, NULL, &fileSize);
apr_file_t* fp = infile.getFileHandle() ;
if (!fp || fileSize == 0)
{