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/llxmlparser.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/llxmlparser.cpp')
| -rw-r--r-- | indra/llxml/llxmlparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |