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/lscript/lscript_execute/lscript_execute.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/lscript/lscript_execute/lscript_execute.cpp')
| -rw-r--r-- | indra/lscript/lscript_execute/lscript_execute.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp index 6c8b1b40eb..b30e781d83 100644 --- a/indra/lscript/lscript_execute/lscript_execute.cpp +++ b/indra/lscript/lscript_execute/lscript_execute.cpp @@ -61,7 +61,7 @@ char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] = /*Flawfinder: ignore*/ //static S64 LLScriptExecute::sGlobalInstructionCount = 0; -LLScriptExecute::LLScriptExecute(FILE *fp) +LLScriptExecute::LLScriptExecute(LLFILE *fp) { U8 sizearray[4]; S32 filesize; @@ -3725,7 +3725,7 @@ void lscript_run(char *filename, BOOL b_debug) BOOL b_state; LLScriptExecute *execute = NULL; - FILE* file = LLFile::fopen(filename, "r"); + LLFILE* file = LLFile::fopen(filename, "r"); if (file) { execute = new LLScriptExecute(file); @@ -3734,7 +3734,7 @@ void lscript_run(char *filename, BOOL b_debug) file = LLFile::fopen(filename, "r"); if (file) { - FILE* fp = LLFile::fopen("lscript.parse", "w"); /*Flawfinder: ignore*/ + LLFILE* fp = LLFile::fopen("lscript.parse", "w"); /*Flawfinder: ignore*/ LLScriptLSOParse *parse = new LLScriptLSOParse(file); parse->printData(fp); delete parse; |