Convergence is almost complete. This brings the diff between the API to < 10k

and makes it use a common set of types in both engine. Fixes the issues with
running both engines and HTTP requests / listens / timers etc..
Also fixes a couple of minor Scene issues and a CTB by nullref.

1 files changed, 1 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs
index 3e8450d..d665bcc 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs
@@ -30,6 +30,7 @@ using System.Runtime.Remoting.Lifetime;
 using System.Threading;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
+using OpenSim.Region.ScriptEngine.Shared;
 
 using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
 using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
@@ -68,13 +69,6 @@ namespace OpenSim.Region.ScriptEngine.Common
             return lease;
         }
 
-        public EventQueueManager.Queue_llDetectParams_Struct _llDetectParams;
-        EventQueueManager.Queue_llDetectParams_Struct IScript.llDetectParams
-        {
-            get { return _llDetectParams; }
-            set { _llDetectParams = value; }
-        }
-
         private Executor m_Exec;
 
         ExecutorBase IScript.Exec