summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/lscript/lscript_compile/indra.l2
-rw-r--r--indra/newview/macview_Prefix.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 57aef07e18..4fa5b58a81 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 c7dd35125c..4d982f1897 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"