diff options
author | Tedd Hansen | 2007-08-14 16:14:19 +0000 |
---|---|---|
committer | Tedd Hansen | 2007-08-14 16:14:19 +0000 |
commit | 9573aa7582f99b8405262452be5816fca7691706 (patch) | |
tree | cf8cef0f8a2c32c284e54e36776c941921e2917a /OpenSim/Region/ScriptEngine/DotNetEngine | |
parent | ScriptEngine: Some error handling, logs to logger (diff) | |
download | opensim-SC-9573aa7582f99b8405262452be5816fca7691706.zip opensim-SC-9573aa7582f99b8405262452be5816fca7691706.tar.gz opensim-SC-9573aa7582f99b8405262452be5816fca7691706.tar.bz2 opensim-SC-9573aa7582f99b8405262452be5816fca7691706.tar.xz |
llSay() works again. Cleanup of debug messages.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
5 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs index f9908e4..641a3f2 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs | |||
@@ -49,14 +49,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
49 | public void llWhisper(int channelID, string text) | 49 | public void llWhisper(int channelID, string text) |
50 | { | 50 | { |
51 | //Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");"); | 51 | //Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");"); |
52 | Console.WriteLine("ScriptEngine", "llWhisper Channel " + channelID + ", Text: \"" + text + "\""); | 52 | Console.WriteLine("llWhisper Channel " + channelID + ", Text: \"" + text + "\""); |
53 | } | 53 | } |
54 | //public void llSay(UInt32 channelID, string text) | 54 | //public void llSay(UInt32 channelID, string text) |
55 | public void llSay(int channelID, string text) | 55 | public void llSay(int channelID, string text) |
56 | { | 56 | { |
57 | //TODO: DO SOMETHING USEFUL HERE | 57 | //TODO: DO SOMETHING USEFUL HERE |
58 | //Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");"); | 58 | //Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");"); |
59 | Console.WriteLine("ScriptEngine", "llSay Channel " + channelID + ", Text: \"" + text + "\""); | 59 | Console.WriteLine("llSay Channel " + channelID + ", Text: \"" + text + "\""); |
60 | //World.SimChat( | 60 | //World.SimChat( |
61 | } | 61 | } |
62 | public void llShout(UInt16 channelID, string text) { return; } | 62 | public void llShout(UInt16 channelID, string text) { return; } |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs index 25db231..e675dde 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
44 | { | 44 | { |
45 | myScriptEngine = _ScriptEngine; | 45 | myScriptEngine = _ScriptEngine; |
46 | // TODO: HOOK EVENTS UP TO SERVER! | 46 | // TODO: HOOK EVENTS UP TO SERVER! |
47 | myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Start"); | 47 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Start"); |
48 | // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager | 48 | // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager |
49 | 49 | ||
50 | // Hook up a test event to our test form | 50 | // Hook up a test event to our test form |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs index 0d8c160..6099a70 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
51 | public EventQueueManager(ScriptEngine _ScriptEngine) | 51 | public EventQueueManager(ScriptEngine _ScriptEngine) |
52 | { | 52 | { |
53 | myScriptEngine = _ScriptEngine; | 53 | myScriptEngine = _ScriptEngine; |
54 | myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Start"); | 54 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Start"); |
55 | // Start worker thread | 55 | // Start worker thread |
56 | EventQueueThread = new Thread(EventQueueThreadLoop); | 56 | EventQueueThread = new Thread(EventQueueThreadLoop); |
57 | EventQueueThread.IsBackground = true; | 57 | EventQueueThread.IsBackground = true; |
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
79 | 79 | ||
80 | private void EventQueueThreadLoop() | 80 | private void EventQueueThreadLoop() |
81 | { | 81 | { |
82 | myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Worker thread spawned"); | 82 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Worker thread spawned"); |
83 | try | 83 | try |
84 | { | 84 | { |
85 | while (true) | 85 | while (true) |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index bcfc06d..5f26434 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
55 | World = Sceneworld; | 55 | World = Sceneworld; |
56 | m_logger = logger; | 56 | m_logger = logger; |
57 | 57 | ||
58 | m_logger.Status("ScriptEngine", "InitializeEngine"); | 58 | //m_logger.Status("ScriptEngine", "InitializeEngine"); |
59 | 59 | ||
60 | // Create all objects we'll be using | 60 | // Create all objects we'll be using |
61 | myEventQueueManager = new EventQueueManager(this); | 61 | myEventQueueManager = new EventQueueManager(this); |
@@ -75,7 +75,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
75 | [Obsolete("!!!FOR DEBUGGING ONLY!!!")] | 75 | [Obsolete("!!!FOR DEBUGGING ONLY!!!")] |
76 | public void StartScript(string ScriptID, string ObjectID) | 76 | public void StartScript(string ScriptID, string ObjectID) |
77 | { | 77 | { |
78 | m_logger.Status("ScriptEngine", "DEBUG: StartScript: " + ScriptID); | 78 | m_logger.Status("ScriptEngine", "DEBUG FUNCTION: StartScript: " + ScriptID); |
79 | myScriptManager.StartScript(ScriptID, ObjectID); | 79 | myScriptManager.StartScript(ScriptID, ObjectID); |
80 | } | 80 | } |
81 | } | 81 | } |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 0c4adc1..634c9ab 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -114,7 +114,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
114 | FileName = ScriptID; | 114 | FileName = ScriptID; |
115 | 115 | ||
116 | // * Does script need compile? Send it to LSL compiler first. (TODO: Use (and clean) compiler cache) | 116 | // * Does script need compile? Send it to LSL compiler first. (TODO: Use (and clean) compiler cache) |
117 | myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Script extension: " + System.IO.Path.GetExtension(FileName).ToLower()); | 117 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Script extension: " + System.IO.Path.GetExtension(FileName).ToLower()); |
118 | switch (System.IO.Path.GetExtension(FileName).ToLower()) | 118 | switch (System.IO.Path.GetExtension(FileName).ToLower()) |
119 | { | 119 | { |
120 | case ".txt": | 120 | case ".txt": |
@@ -174,7 +174,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
174 | /// <returns></returns> | 174 | /// <returns></returns> |
175 | private OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass LoadAndInitAssembly(AppDomain FreeAppDomain, string FileName) | 175 | private OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass LoadAndInitAssembly(AppDomain FreeAppDomain, string FileName) |
176 | { | 176 | { |
177 | myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Loading Assembly " + FileName); | 177 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Loading Assembly " + FileName); |
178 | // Load .Net Assembly (.dll) | 178 | // Load .Net Assembly (.dll) |
179 | // Initialize and return it | 179 | // Initialize and return it |
180 | 180 | ||