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.

6 files changed, 19 insertions, 19 deletions

diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 686524b7da..0b28c70965 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -217,7 +217,7 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 
 // exportFile should be replaced with exportLegacyStream
 // not sure whether exportLegacyStream(llofstream(fp)) would work, fp may need to get icramented...
-BOOL LLInventoryObject::exportFile(FILE* fp, BOOL) const
+BOOL LLInventoryObject::exportFile(LLFILE* fp, BOOL) const
 {
 	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
 	fprintf(fp, "\tinv_object\t0\n\t{\n");
@@ -520,7 +520,7 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
 }
 
 // virtual
-BOOL LLInventoryItem::importFile(FILE* fp)
+BOOL LLInventoryItem::importFile(LLFILE* fp)
 {
 	// *NOTE: Changing the buffer size will require changing the scanf
 	// calls below.
@@ -674,7 +674,7 @@ BOOL LLInventoryItem::importFile(FILE* fp)
 	return success;
 }
 
-BOOL LLInventoryItem::exportFile(FILE* fp, BOOL include_asset_key) const
+BOOL LLInventoryItem::exportFile(LLFILE* fp, BOOL include_asset_key) const
 {
 	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
 	fprintf(fp, "\tinv_item\t0\n\t{\n");
@@ -1429,7 +1429,7 @@ void LLInventoryCategory::unpackMessage(LLMessageSystem* msg,
 }
 	
 // virtual
-BOOL LLInventoryCategory::importFile(FILE* fp)
+BOOL LLInventoryCategory::importFile(LLFILE* fp)
 {
 	// *NOTE: Changing the buffer size will require changing the scanf
 	// calls below.
@@ -1495,7 +1495,7 @@ BOOL LLInventoryCategory::importFile(FILE* fp)
 	return TRUE;
 }
 
-BOOL LLInventoryCategory::exportFile(FILE* fp, BOOL) const
+BOOL LLInventoryCategory::exportFile(LLFILE* fp, BOOL) const
 {
 	char uuid_str[UUID_STR_LENGTH];	/* Flawfinder: ignore */
 	fprintf(fp, "\tinv_category\t0\n\t{\n");
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 8b579ec306..6a743e2bbd 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -101,8 +101,8 @@ public:
 
 	// file support - implemented here so that a minimal information
 	// set can be transmitted between simulator and viewer.
-// 	virtual BOOL importFile(FILE* fp);
-	virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const;
+// 	virtual BOOL importFile(LLFILE* fp);
+	virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const;
 
 	virtual BOOL importLegacyStream(std::istream& input_stream);
 	virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const;
@@ -259,8 +259,8 @@ public:
 	// we want to detect network mangling somehow.
 	virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
 	// file support
-	virtual BOOL importFile(FILE* fp);
-	virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const;
+	virtual BOOL importFile(LLFILE* fp);
+	virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const;
 
 	virtual BOOL importLegacyStream(std::istream& input_stream);
 	virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const;
@@ -319,8 +319,8 @@ public:
 	bool fromLLSD(LLSD& sd);
 
 	// file support
-	virtual BOOL importFile(FILE* fp);
-	virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const;
+	virtual BOOL importFile(LLFILE* fp);
+	virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const;
 
 	virtual BOOL importLegacyStream(std::istream& input_stream);
 	virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const;
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index f816d54181..1788fedf50 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -544,7 +544,7 @@ void LLPermissions::unpackMessage(LLMessageSystem* msg, const char* block, S32 b
 // File support
 //
 
-BOOL LLPermissions::importFile(FILE* fp)
+BOOL LLPermissions::importFile(LLFILE* fp)
 {
 	init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null);
 	const S32 BUFSIZE = 16384;
@@ -648,7 +648,7 @@ BOOL LLPermissions::importFile(FILE* fp)
 }
 
 
-BOOL LLPermissions::exportFile(FILE* fp) const
+BOOL LLPermissions::exportFile(LLFILE* fp) const
 {
 	char uuid_str[256];	/* Flawfinder: ignore */
 
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 36acc438be..6f88186700 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -302,8 +302,8 @@ public:
 	void	unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
 
 	// Load/save support
-	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;
diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp
index c268544955..0c2ba82302 100644
--- a/indra/llinventory/llsaleinfo.cpp
+++ b/indra/llinventory/llsaleinfo.cpp
@@ -84,7 +84,7 @@ U32 LLSaleInfo::getCRC32() const
 }
 
 
-BOOL LLSaleInfo::exportFile(FILE* fp) const
+BOOL LLSaleInfo::exportFile(LLFILE* fp) const
 {
 	fprintf(fp, "\tsale_info\t0\n\t{\n");
 	fprintf(fp, "\t\tsale_type\t%s\n", lookup(mSaleType));
@@ -158,7 +158,7 @@ BOOL LLSaleInfo::importXML(LLXMLNode* node)
 	return success;
 }
 
-BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask)
+BOOL LLSaleInfo::importFile(LLFILE* fp, BOOL& has_perm_mask, U32& perm_mask)
 {
 	has_perm_mask = FALSE;
 
diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h
index 1c9db6e346..e9753cdfba 100644
--- a/indra/llinventory/llsaleinfo.h
+++ b/indra/llinventory/llsaleinfo.h
@@ -91,8 +91,8 @@ public:
 
 
 	// file serialization
-	BOOL exportFile(FILE* fp) const;
-	BOOL importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask);
+	BOOL exportFile(LLFILE* fp) const;
+	BOOL importFile(LLFILE* fp, BOOL& has_perm_mask, U32& perm_mask);
 
 	BOOL exportLegacyStream(std::ostream& output_stream) const;
 	LLSD asLLSD() const;