From 189599b6ff0c4e6b81e761fbc990c057189359f2 Mon Sep 17 00:00:00 2001 From: Robert Knop Date: Thu, 4 Dec 2008 22:36:34 +0000 Subject: Merging from server/server-1.25 back to trunk. svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv. --- indra/lscript/lscript_compile/lscript_tree.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/lscript/lscript_compile/lscript_tree.cpp') diff --git a/indra/lscript/lscript_compile/lscript_tree.cpp b/indra/lscript/lscript_compile/lscript_tree.cpp index 66f8825845..cd2dc87c5e 100644 --- a/indra/lscript/lscript_compile/lscript_tree.cpp +++ b/indra/lscript/lscript_compile/lscript_tree.cpp @@ -630,7 +630,9 @@ static void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetTy switch(targetType) { case LST_INTEGER: - fprintf(fp, "conv.i4\n"); + //fprintf(fp, "call int32 [LslLibrary]LindenLab.SecondLife.LslRunTime::ToInteger(float32)\n"); + fprintf(fp, "conv.i4\n"); // TODO replace this line with the above + // we the entire grid is > 1.25.1 break; case LST_STRING: fprintf(fp, "call string [LslLibrary]LindenLab.SecondLife.LslRunTime::ToString(float32)\n"); -- cgit v1.2.3