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.

3 files changed, 7 insertions, 7 deletions

diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 9b0675945d..bf9a9a14a5 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -572,7 +572,7 @@ bool LLXMLNode::parseFile(
 	LLXMLNode* defaults_tree)
 {
 	// Read file
-	FILE* fp = LLFile::fopen(filename.c_str(), "rb");		/* Flawfinder: ignore */
+	LLFILE* fp = LLFile::fopen(filename.c_str(), "rb");		/* Flawfinder: ignore */
 	if (fp == NULL)
 	{
 		node = new LLXMLNode();
@@ -741,12 +741,12 @@ BOOL LLXMLNode::isFullyDefault()
 }
 
 // static
-void LLXMLNode::writeHeaderToFile(FILE *fOut)
+void LLXMLNode::writeHeaderToFile(LLFILE *fOut)
 {
 	fprintf(fOut, "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n");
 }
 
-void LLXMLNode::writeToFile(FILE *fOut, LLString indent)
+void LLXMLNode::writeToFile(LLFILE *fOut, LLString indent)
 {
 	if (isFullyDefault())
 	{
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index d4b4a4655b..19156cf556 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -133,8 +133,8 @@ public:
 	static bool updateNode(
 	LLXMLNodePtr& node,
 	LLXMLNodePtr& update_node);
-	static void writeHeaderToFile(FILE *fOut);
-    void writeToFile(FILE *fOut, LLString indent = LLString());
+	static void writeHeaderToFile(LLFILE *fOut);
+    void writeToFile(LLFILE *fOut, LLString indent = LLString());
     void writeToOstream(std::ostream& output_stream, const LLString& indent = LLString());
 
     // Utility
diff --git a/indra/llxml/llxmlparser.cpp b/indra/llxml/llxmlparser.cpp
index 10e6f3f03d..5591551bb7 100644
--- a/indra/llxml/llxmlparser.cpp
+++ b/indra/llxml/llxmlparser.cpp
@@ -77,7 +77,7 @@ BOOL LLXmlParser::parseFile(const std::string &path)
 	
 	BOOL success = TRUE;
 
-	FILE* file = LLFile::fopen(path.c_str(), "rb");		/* Flawfinder: ignore */
+	LLFILE* file = LLFile::fopen(path.c_str(), "rb");		/* Flawfinder: ignore */
 	if( !file )
 	{
 		snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Couldn't open file %s", path.c_str());	/* Flawfinder: ignore */
@@ -393,7 +393,7 @@ int main()
 {
   char buf[1024];
 
-  FILE* file = LLFile::fopen("test.xml", "rb");
+  LLFILE* file = LLFile::fopen("test.xml", "rb");
   if( !file )
   {
 	  return 1;