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.

2 files changed, 13 insertions, 12 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");
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 11a7c2f1c6..91415ee036 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -52,6 +52,7 @@ class LLVolume;
 #include "llstrider.h"
 #include "v4coloru.h"
 #include "llmemory.h"
+#include "llfile.h"
 
 //============================================================================
 
@@ -229,8 +230,8 @@ public:
 	
 	void copyParams(const LLProfileParams &params);
 
-	BOOL importFile(FILE *fp);
-	BOOL exportFile(FILE *fp) const;
+	BOOL importFile(LLFILE *fp);
+	BOOL exportFile(LLFILE *fp) const;
 
 	BOOL importLegacyStream(std::istream& input_stream);
 	BOOL exportLegacyStream(std::ostream& output_stream) const;
@@ -354,8 +355,8 @@ public:
 
 	void copyParams(const LLPathParams &params);
 
-	BOOL importFile(FILE *fp);
-	BOOL exportFile(FILE *fp) const;
+	BOOL importFile(LLFILE *fp);
+	BOOL exportFile(LLFILE *fp) const;
 
 	BOOL importLegacyStream(std::istream& input_stream);
 	BOOL exportLegacyStream(std::ostream& output_stream) const;
@@ -545,8 +546,8 @@ public:
 	const LLPathParams &getPathParams() const {return mPathParams;}
 	LLPathParams &getPathParams() {return mPathParams;}
 
-	BOOL importFile(FILE *fp);
-	BOOL exportFile(FILE *fp) const;
+	BOOL importFile(LLFILE *fp);
+	BOOL exportFile(LLFILE *fp) const;
 
 	BOOL importLegacyStream(std::istream& input_stream);
 	BOOL exportLegacyStream(std::ostream& output_stream) const;