v2 lscript merge

indra/lscript/lscript_execute.h

@@ -36,7 +36,8 @@
 #include "lscript_byteconvert.h"
 #include "linked_lists.h"
 #include "lscript_library.h"
-#include "lltimer.h"
+
+class LLTimer;
 
 // Return values for run() methods
 const U32 NO_DELETE_FLAG	= 0x0000;
@@ -370,8 +371,7 @@ class LLScriptExecute
 {
 public:
 	LLScriptExecute();
-	virtual ~LLScriptExecute() {;}
-
+	virtual ~LLScriptExecute()  = 0;
 	virtual S32 getVersion() const = 0;
 	virtual void deleteAllEvents() = 0;
 	virtual void addEvent(LLScriptDataCollection* event) = 0;