aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs2
4 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs
index e95d1bb..6df5b9f 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Common.cs
@@ -36,10 +36,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
36 { 36 {
37 static public bool Debug = true; 37 static public bool Debug = true;
38 38
39 public delegate void SendToDebugEventDelegate(string Message); 39 //public delegate void SendToDebugEventDelegate(string Message);
40 public delegate void SendToLogEventDelegate(string Message); 40 //public delegate void SendToLogEventDelegate(string Message);
41 static public event SendToDebugEventDelegate SendToDebugEvent; 41 //static public event SendToDebugEventDelegate SendToDebugEvent;
42 static public event SendToLogEventDelegate SendToLogEvent; 42 //static public event SendToLogEventDelegate SendToLogEvent;
43 43
44 static public void SendToDebug(string Message) 44 static public void SendToDebug(string Message)
45 { 45 {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs
index bbdafad..3536bf3 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Server_API/LSL_BuiltIn_Commands_TestImplementation.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
70 //public void llSay(UInt32 channelID, string text) 70 //public void llSay(UInt32 channelID, string text)
71 public void llSay(object channelID, object text) 71 public void llSay(object channelID, object text)
72 { 72 {
73 //TODO: DO SOMETHING USEFUL HERE
73 Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");"); 74 Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");");
74 Common.SendToLog("llSay Channel " + (UInt32)channelID + ", Text: \"" + (string)text + "\""); 75 Common.SendToLog("llSay Channel " + (UInt32)channelID + ", Text: \"" + (string)text + "\"");
75 } 76 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
index 5a1b2b6..a69e27c 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
@@ -44,8 +44,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
44 // TODO: HOOK EVENTS UP TO SERVER! 44 // TODO: HOOK EVENTS UP TO SERVER!
45 Common.SendToDebug("EventManager Start"); 45 Common.SendToDebug("EventManager Start");
46 46
47 // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager
48
47 // Hook up a test event to our test form 49 // Hook up a test event to our test form
48 Common.SendToDebug("EventManager Hooking up dummy-event: touch_start"); 50 Common.SendToDebug("EventManager Hooking up dummy-event: touch_start");
51 // TODO: REPLACE THIS WITH A REAL TOUCH_START EVENT IN SERVER
49 //myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start); 52 //myScriptEngine.World.touch_start += new TempWorldInterfaceEventDelegates.touch_start(touch_start);
50 } 53 }
51 54
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
index 321fd91..bc735c9 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngineInterface.cs
@@ -29,7 +29,7 @@
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32 32//TODO: WHERE TO PLACE THIS?
33namespace OpenSim.Region.ScriptEngine.DotNetEngine 33namespace OpenSim.Region.ScriptEngine.DotNetEngine
34{ 34{
35 interface ScriptEngineInterface 35 interface ScriptEngineInterface