v2 lscript merge

2011-06-16 23:56:56 -05:00
parent cfcc0a946d
commit 102ceaadfe
9 changed files with 74 additions and 106 deletions
--- a/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ b/indra/lscript/lscript_execute/lscript_readlso.cpp
@@ -39,7 +39,7 @@
 LLScriptLSOParse::LLScriptLSOParse(LLFILE *fp)
 {
 	U8  sizearray[4];
-	S32 filesize;
+	size_t filesize;
 	S32 pos = 0;
 	if (fread(&sizearray, 1, 4, fp) != 4)
 	{