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.

9 files changed, 12 insertions, 12 deletions

diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index e2043144b8..1f4ea70d95 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -1242,7 +1242,7 @@ void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAss
 		uuid.toString(uuid_str);
 		snprintf(filename,sizeof(filename),"%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type));	/* Flawfinder: ignore */
 
-		FILE* fp = LLFile::fopen(filename, "wb");	/* Flawfinder: ignore */ 
+		LLFILE* fp = LLFile::fopen(filename, "wb");	/* Flawfinder: ignore */ 
 		if (fp)
 		{
 			const S32 buf_size = 65536;
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index d482011194..1ad5179455 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -323,7 +323,7 @@ void LLCacheName::cancelCallback(const LLUUID& id, LLCacheNameCallback callback,
 	}
 }
 
-void LLCacheName::importFile(FILE* fp)
+void LLCacheName::importFile(LLFILE* fp)
 {
 	S32 count = 0;
 
diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
index d9518e0f91..5dfde80622 100644
--- a/indra/llmessage/llcachename.h
+++ b/indra/llmessage/llcachename.h
@@ -64,7 +64,7 @@ public:
 	void cancelCallback(const LLUUID& id, LLCacheNameCallback callback, void* user_data = NULL);
 
 	// janky old format. Remove after a while. Phoenix. 2008-01-30
-	void importFile(FILE* fp);
+	void importFile(LLFILE* fp);
 
 	// storing cache on disk; for viewer, in name.cache
 	bool importFile(std::istream& istr);
diff --git a/indra/llmessage/lldatapacker.h b/indra/llmessage/lldatapacker.h
index ff33d4ecc2..d6d1f5c1da 100644
--- a/indra/llmessage/lldatapacker.h
+++ b/indra/llmessage/lldatapacker.h
@@ -330,7 +330,7 @@ inline BOOL LLDataPackerAsciiBuffer::verifyLength(const S32 data_size, const cha
 class LLDataPackerAsciiFile : public LLDataPacker
 {
 public:
-	LLDataPackerAsciiFile(FILE *fp, const S32 indent = 2)
+	LLDataPackerAsciiFile(LLFILE *fp, const S32 indent = 2)
 	: 	LLDataPacker(),
 		mIndent(indent),
 		mFP(fp),
@@ -407,7 +407,7 @@ protected:
 
 protected:
 	S32 mIndent;
-	FILE *mFP;
+	LLFILE *mFP;
 	std::ostream* mOutputStream;
 	std::istream* mInputStream;
 };
diff --git a/indra/llmessage/lltransfersourcefile.h b/indra/llmessage/lltransfersourcefile.h
index c3523b10d7..84a6bd259f 100644
--- a/indra/llmessage/lltransfersourcefile.h
+++ b/indra/llmessage/lltransfersourcefile.h
@@ -74,7 +74,7 @@ protected:
 
 protected:
 	LLTransferSourceParamsFile mParams;
-	FILE *mFP;
+	LLFILE *mFP;
 };
 
 #endif // LL_LLTRANSFERSOURCEFILE_H
diff --git a/indra/llmessage/lltransfertargetfile.h b/indra/llmessage/lltransfertargetfile.h
index 18b44e2611..6b837f4890 100644
--- a/indra/llmessage/lltransfertargetfile.h
+++ b/indra/llmessage/lltransfertargetfile.h
@@ -69,7 +69,7 @@ protected:
 
 	LLTransferTargetParamsFile mParams;
 
-	FILE *mFP;
+	LLFILE *mFP;
 };
 
 #endif // LL_LLTRANSFERTARGETFILE_H
diff --git a/indra/llmessage/llxfer_file.cpp b/indra/llmessage/llxfer_file.cpp
index caa418e564..6b71e7db8f 100644
--- a/indra/llmessage/llxfer_file.cpp
+++ b/indra/llmessage/llxfer_file.cpp
@@ -353,7 +353,7 @@ S32 LLXfer_File::processEOF()
 			}
 			else
 			{
-				//FILE* fp = LLFile::fopen(mTempFilename, "r");
+				//LLFILE* fp = LLFile::fopen(mTempFilename, "r");
 				//llwarns << "File " << mTempFilename << " does "
 				//		<< (!fp ? "not" : "" ) << " exit." << llendl;
 				//if(fp) fclose(fp);
@@ -424,8 +424,8 @@ U32 LLXfer_File::getXferTypeTag()
 S32 copy_file(const char* from, const char* to)
 {
 	S32 rv = 0;
-	FILE* in = LLFile::fopen(from, "rb");	/*Flawfinder: ignore*/
-	FILE* out = LLFile::fopen(to, "wb");	/*Flawfinder: ignore*/
+	LLFILE* in = LLFile::fopen(from, "rb");	/*Flawfinder: ignore*/
+	LLFILE* out = LLFile::fopen(to, "wb");	/*Flawfinder: ignore*/
 	if(in && out)
 	{
 		S32 read = 0;
diff --git a/indra/llmessage/llxfer_file.h b/indra/llmessage/llxfer_file.h
index b87417d290..5302302e54 100644
--- a/indra/llmessage/llxfer_file.h
+++ b/indra/llmessage/llxfer_file.h
@@ -38,7 +38,7 @@
 class LLXfer_File : public LLXfer
 {
  protected:
- 	FILE *mFp;
+ 	LLFILE *mFp;
 	char mLocalFilename[LL_MAX_PATH];		/* Flawfinder : ignore */
 	char mRemoteFilename[LL_MAX_PATH];		/* Flawfinder : ignore */
 	ELLPath mRemotePath;
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 8d961de6c9..26678d61cc 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -2419,7 +2419,7 @@ void process_deny_trusted_circuit(LLMessageSystem *msg, void **)
 void dump_prehash_files()
 {
 	U32 i;
-	FILE* fp = LLFile::fopen("../../indra/llmessage/message_prehash.h", "w");	/* Flawfinder: ignore */
+	LLFILE* fp = LLFile::fopen("../../indra/llmessage/message_prehash.h", "w");	/* Flawfinder: ignore */
 	if (fp)
 	{
 		fprintf(