diff options
Diffstat (limited to 'linden/indra/llcharacter/llkeyframemotionparam.cpp')
-rw-r--r-- | linden/indra/llcharacter/llkeyframemotionparam.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linden/indra/llcharacter/llkeyframemotionparam.cpp b/linden/indra/llcharacter/llkeyframemotionparam.cpp index 385a848..a9c1f6f 100644 --- a/linden/indra/llcharacter/llkeyframemotionparam.cpp +++ b/linden/indra/llcharacter/llkeyframemotionparam.cpp | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -353,7 +354,9 @@ BOOL LLKeyframeMotionParam::loadMotions() | |||
353 | // open the file | 354 | // open the file |
354 | //------------------------------------------------------------------------- | 355 | //------------------------------------------------------------------------- |
355 | S32 fileSize = 0; | 356 | S32 fileSize = 0; |
356 | apr_file_t* fp = ll_apr_file_open(path, LL_APR_R, &fileSize); | 357 | LLAPRFile infile ; |
358 | infile.open(path, LL_APR_R, NULL, &fileSize); | ||
359 | apr_file_t* fp = infile.getFileHandle() ; | ||
357 | if (!fp || fileSize == 0) | 360 | if (!fp || fileSize == 0) |
358 | { | 361 | { |
359 | llinfos << "ERROR: can't open: " << path << llendl; | 362 | llinfos << "ERROR: can't open: " << path << llendl; |
@@ -365,7 +368,6 @@ BOOL LLKeyframeMotionParam::loadMotions() | |||
365 | if ( !text ) | 368 | if ( !text ) |
366 | { | 369 | { |
367 | llinfos << "ERROR: can't allocated keyframe text buffer." << llendl; | 370 | llinfos << "ERROR: can't allocated keyframe text buffer." << llendl; |
368 | apr_file_close(fp); | ||
369 | return FALSE; | 371 | return FALSE; |
370 | } | 372 | } |
371 | 373 | ||
@@ -392,7 +394,7 @@ BOOL LLKeyframeMotionParam::loadMotions() | |||
392 | //------------------------------------------------------------------------- | 394 | //------------------------------------------------------------------------- |
393 | // close the file | 395 | // close the file |
394 | //------------------------------------------------------------------------- | 396 | //------------------------------------------------------------------------- |
395 | apr_file_close( fp ); | 397 | infile.close(); |
396 | 398 | ||
397 | //------------------------------------------------------------------------- | 399 | //------------------------------------------------------------------------- |
398 | // check for error | 400 | // check for error |