diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
commit | 63e7894148fdc7064b422bf65a0b75ffcf293496 (patch) | |
tree | 4cca89d9da518f264001e7cb4950f453647f2e5f /indra/llxml/llxmlnode.cpp | |
parent | a75b85112ffa4b7140561083c2e5de05fb510805 (diff) |
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.
Diffstat (limited to 'indra/llxml/llxmlnode.cpp')
-rw-r--r-- | indra/llxml/llxmlnode.cpp | 6 |
1 files changed, 3 insertions, 3 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()) { |