6 files changed, 26 insertions, 19 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index 46b898a..5a1b2b6 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             

             // Hook up a test event to our test form

             Common.SendToDebug("EventManager Hooking up dummy-event: touch_start");

-            myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start);

+            //myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start);

         }

 

         public void touch_start(string ObjectID)

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index 35afaf7..a1e2e1d 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         // This is the root object for ScriptEngine

         //

 

-        internal TempWorldInterface World;

+        internal OpenSim.Region.Environment.Scenes.Scene World;

         internal EventManager myEventManager;                   // Handles and queues incoming events from OpenSim

         internal EventQueueManager myEventQueueManager;         // Executes events

         internal ScriptManager myScriptManager;                 // Load, unload and execute scripts

@@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             Common.SendToDebug("ScriptEngine Object Initialized");

         }

 

-        public void InitializeEngine(TempWorldInterface Sceneworld)

+        public void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld)

         {

             World = Sceneworld;

             Common.SendToDebug("ScriptEngine InitializeEngine()");

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
index c561523..321fd91 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 {

     interface ScriptEngineInterface

     {

-        void InitializeEngine(TempWorldInterface Sceneworld);

+        void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld);

         void Shutdown();

     }

 }

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/TODO.txt b/OpenSim/Region/ScriptEngine/DotNetEngine/TODO.txt
new file mode 100644
index 0000000..531ff13
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/TODO.txt
@@ -0,0 +1,21 @@
+

+

+

+EventManager.cs

+---------------

+* Hook up to the worlds touch-event:

+myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start);

+

+* Modify:

+public void touch_start(string ObjectID)

+to correct parameters to match the event

+

+* Make hooks to add/remove script using ScriptManager.cs

+

+

+

+LSL_BuiltIn_Commands_TestImplementation.cs

+------------------------------------------

+* Change llSay to do something useful (send message)

+

+

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/TempWorldInterface.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/TempWorldInterface.cs
deleted file mode 100644
index 6ba6c07..0000000
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/TempWorldInterface.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Region.ScriptEngine.DotNetEngine

-{

-    public class TempWorldInterfaceEventDelegates

-    {

-        public delegate void touch_start(string ObjectID);

-    }

-    public interface TempWorldInterface

-    {

-        event TempWorldInterfaceEventDelegates.touch_start touch_start;

-    }

-}

diff --git a/prebuild.xml b/prebuild.xml
index 8ef1cfd..9fd4f76 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -947,6 +947,7 @@
       <Reference name="System" localCopy="false"/>
       <Reference name="System.Data" localCopy="false"/>
       <Reference name="System.Xml" localCopy="false"/>
+      <Reference name="OpenSim.Region.Environment" />
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Data"/>