diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 57aef07e18446481bfffaa36d9ba81624af040ce..4fa5b58a8185d931c014ae6ae36171e2a27849fd 100644 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -678,7 +678,7 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename, // Reset the lexer's internal buffering. - yyrestart(yyin); + b_parse_ok = !yyparse(); diff --git a/indra/newview/macview_Prefix.h b/indra/newview/macview_Prefix.h index c7dd35125cdf64a1fc5189c7f13fcd5ca194ff3e..4d982f18973c50f125c9edce5b3c3a78f898863f 100644 --- a/indra/newview/macview_Prefix.h +++ b/indra/newview/macview_Prefix.h @@ -107,7 +107,6 @@ #include "llvosky.h" #include "llworld.h" #include "pipeline.h" -#include "viewer.h" /////////////////// From llfloater.cpp #include "llbutton.h"