Put in some changes along sg1.4 dev history.

2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions
--- a/indra/lscript/lscript_execute.h
+++ b/indra/lscript/lscript_execute.h
@@ -36,6 +36,7 @@
 #include "lscript_byteconvert.h"
 #include "linked_lists.h"
 #include "lscript_library.h"
+#include "lltimer.h"

 // Return values for run() methods
 const U32 NO_DELETE_FLAG	= 0x0000;
--- a/indra/lscript/lscript_execute/llscriptresource.cpp
+++ b/indra/lscript/lscript_execute/llscriptresource.cpp
@@ -30,6 +30,7 @@
 * $/LicenseInfo$
 */

+#include "linden_common.h"
 #include "llscriptresource.h"
 #include "llerror.h"