aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2007-08-09 18:57:41 +0000
committerTedd Hansen2007-08-09 18:57:41 +0000
commit6829c45cb3d490f54f001de9349e64ee75a8c9af (patch)
tree98b4a25dde0c7531459300cb4763c8bdc3948b12
parentDeleted old LSLEngine files (those under Scene.Scripting) (diff)
downloadopensim-SC_OLD-6829c45cb3d490f54f001de9349e64ee75a8c9af.zip
opensim-SC_OLD-6829c45cb3d490f54f001de9349e64ee75a8c9af.tar.gz
opensim-SC_OLD-6829c45cb3d490f54f001de9349e64ee75a8c9af.tar.bz2
opensim-SC_OLD-6829c45cb3d490f54f001de9349e64ee75a8c9af.tar.xz
ScriptEngine just needs 2 events hooked up and llSay() implemented to work. See TODO.txt for details.
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/TODO.txt21
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/TempWorldInterface.cs15
-rw-r--r--prebuild.xml1
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
46 46
47 // Hook up a test event to our test form 47 // Hook up a test event to our test form
48 Common.SendToDebug("EventManager Hooking up dummy-event: touch_start"); 48 Common.SendToDebug("EventManager Hooking up dummy-event: touch_start");
49 myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start); 49 //myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start);
50 } 50 }
51 51
52 public void touch_start(string ObjectID) 52 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
38 // This is the root object for ScriptEngine 38 // This is the root object for ScriptEngine
39 // 39 //
40 40
41 internal TempWorldInterface World; 41 internal OpenSim.Region.Environment.Scenes.Scene World;
42 internal EventManager myEventManager; // Handles and queues incoming events from OpenSim 42 internal EventManager myEventManager; // Handles and queues incoming events from OpenSim
43 internal EventQueueManager myEventQueueManager; // Executes events 43 internal EventQueueManager myEventQueueManager; // Executes events
44 internal ScriptManager myScriptManager; // Load, unload and execute scripts 44 internal ScriptManager myScriptManager; // Load, unload and execute scripts
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
48 Common.SendToDebug("ScriptEngine Object Initialized"); 48 Common.SendToDebug("ScriptEngine Object Initialized");
49 } 49 }
50 50
51 public void InitializeEngine(TempWorldInterface Sceneworld) 51 public void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld)
52 { 52 {
53 World = Sceneworld; 53 World = Sceneworld;
54 Common.SendToDebug("ScriptEngine InitializeEngine()"); 54 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
34{ 34{
35 interface ScriptEngineInterface 35 interface ScriptEngineInterface
36 { 36 {
37 void InitializeEngine(TempWorldInterface Sceneworld); 37 void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld);
38 void Shutdown(); 38 void Shutdown();
39 } 39 }
40} 40}
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 @@
1
2
3
4EventManager.cs
5---------------
6* Hook up to the worlds touch-event:
7myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start);
8
9* Modify:
10public void touch_start(string ObjectID)
11to correct parameters to match the event
12
13* Make hooks to add/remove script using ScriptManager.cs
14
15
16
17LSL_BuiltIn_Commands_TestImplementation.cs
18------------------------------------------
19* Change llSay to do something useful (send message)
20
21
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 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Region.ScriptEngine.DotNetEngine
6{
7 public class TempWorldInterfaceEventDelegates
8 {
9 public delegate void touch_start(string ObjectID);
10 }
11 public interface TempWorldInterface
12 {
13 event TempWorldInterfaceEventDelegates.touch_start touch_start;
14 }
15}
diff --git a/prebuild.xml b/prebuild.xml
index 8ef1cfd..9fd4f76 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -947,6 +947,7 @@
947 <Reference name="System" localCopy="false"/> 947 <Reference name="System" localCopy="false"/>
948 <Reference name="System.Data" localCopy="false"/> 948 <Reference name="System.Data" localCopy="false"/>
949 <Reference name="System.Xml" localCopy="false"/> 949 <Reference name="System.Xml" localCopy="false"/>
950 <Reference name="OpenSim.Region.Environment" />
950 <Reference name="OpenSim.Framework"/> 951 <Reference name="OpenSim.Framework"/>
951 <Reference name="OpenSim.Framework.Console"/> 952 <Reference name="OpenSim.Framework.Console"/>
952 <Reference name="OpenSim.Framework.Data"/> 953 <Reference name="OpenSim.Framework.Data"/>