From 63e7894148fdc7064b422bf65a0b75ffcf293496 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 8 May 2008 18:41:20 +0000 Subject: 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. --- indra/llxml/llxmlnode.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llxml/llxmlnode.cpp') 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, "\n"); } -void LLXMLNode::writeToFile(FILE *fOut, LLString indent) +void LLXMLNode::writeToFile(LLFILE *fOut, LLString indent) { if (isFullyDefault()) { -- cgit v1.2.3