diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
| commit | 63e7894148fdc7064b422bf65a0b75ffcf293496 (patch) | |
| tree | 4cca89d9da518f264001e7cb4950f453647f2e5f /indra/llmath/llvolume.cpp | |
| parent | a75b85112ffa4b7140561083c2e5de05fb510805 (diff) | |
QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index f4052f336f..e34c866a80 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -770,7 +770,7 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai -BOOL LLProfileParams::importFile(FILE *fp) +BOOL LLProfileParams::importFile(LLFILE *fp) { LLMemType m1(LLMemType::MTYPE_VOLUME); @@ -834,7 +834,7 @@ BOOL LLProfileParams::importFile(FILE *fp) } -BOOL LLProfileParams::exportFile(FILE *fp) const +BOOL LLProfileParams::exportFile(LLFILE *fp) const { fprintf(fp,"\t\tprofile 0\n"); fprintf(fp,"\t\t{\n"); @@ -1282,7 +1282,7 @@ BOOL LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split, } -BOOL LLPathParams::importFile(FILE *fp) +BOOL LLPathParams::importFile(LLFILE *fp) { LLMemType m1(LLMemType::MTYPE_VOLUME); @@ -1403,7 +1403,7 @@ BOOL LLPathParams::importFile(FILE *fp) } -BOOL LLPathParams::exportFile(FILE *fp) const +BOOL LLPathParams::exportFile(LLFILE *fp) const { fprintf(fp, "\t\tpath 0\n"); fprintf(fp, "\t\t{\n"); @@ -3777,7 +3777,7 @@ BOOL LLVolume::cleanupTriangleData( const S32 num_input_vertices, } -BOOL LLVolumeParams::importFile(FILE *fp) +BOOL LLVolumeParams::importFile(LLFILE *fp) { LLMemType m1(LLMemType::MTYPE_VOLUME); @@ -3822,7 +3822,7 @@ BOOL LLVolumeParams::importFile(FILE *fp) return TRUE; } -BOOL LLVolumeParams::exportFile(FILE *fp) const +BOOL LLVolumeParams::exportFile(LLFILE *fp) const { fprintf(fp,"\tshape 0\n"); fprintf(fp,"\t{\n"); |