OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

llSay() works again. Cleanup of debug messages.

afrisby
Tedd Hansen 2007-08-14 16:14:19 +00:00
parent afaa12a9e2
commit 9573aa7582
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
View File

@ -49,14 +49,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
public void llWhisper(int channelID, string text) public void llWhisper(int channelID, string text)
{ {
//Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");"); //Common.SendToDebug("INTERNAL FUNCTION llWhisper(" + channelID + ", \"" + text + "\");");
Console.WriteLine("ScriptEngine", "llWhisper Channel " + channelID + ", Text: \"" + text + "\""); Console.WriteLine("llWhisper Channel " + channelID + ", Text: \"" + text + "\"");
} }
//public void llSay(UInt32 channelID, string text) //public void llSay(UInt32 channelID, string text)
public void llSay(int channelID, string text) public void llSay(int channelID, string text)
{ {
//TODO: DO SOMETHING USEFUL HERE //TODO: DO SOMETHING USEFUL HERE
//Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");"); //Common.SendToDebug("INTERNAL FUNCTION llSay(" + (UInt32)channelID + ", \"" + (string)text + "\");");
Console.WriteLine("ScriptEngine", "llSay Channel " + channelID + ", Text: \"" + text + "\""); Console.WriteLine("llSay Channel " + channelID + ", Text: \"" + text + "\"");
//World.SimChat( //World.SimChat(
} }
public void llShout(UInt16 channelID, string text) { return; } public void llShout(UInt16 channelID, string text) { return; }

2
OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
View File

@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
{ {
myScriptEngine = _ScriptEngine; myScriptEngine = _ScriptEngine;
// TODO: HOOK EVENTS UP TO SERVER! // TODO: HOOK EVENTS UP TO SERVER!
myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Start"); //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Start");
// TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager
// Hook up a test event to our test form // Hook up a test event to our test form

4
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
public EventQueueManager(ScriptEngine _ScriptEngine) public EventQueueManager(ScriptEngine _ScriptEngine)
{ {
myScriptEngine = _ScriptEngine; myScriptEngine = _ScriptEngine;
myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Start"); //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Start");
// Start worker thread // Start worker thread
EventQueueThread = new Thread(EventQueueThreadLoop); EventQueueThread = new Thread(EventQueueThreadLoop);
EventQueueThread.IsBackground = true; EventQueueThread.IsBackground = true;
@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
private void EventQueueThreadLoop() private void EventQueueThreadLoop()
{ {
myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Worker thread spawned"); //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventQueueManager Worker thread spawned");
try try
{ {
while (true) while (true)

4
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
World = Sceneworld; World = Sceneworld;
m_logger = logger; m_logger = logger;
m_logger.Status("ScriptEngine", "InitializeEngine"); //m_logger.Status("ScriptEngine", "InitializeEngine");
// Create all objects we'll be using // Create all objects we'll be using
myEventQueueManager = new EventQueueManager(this); myEventQueueManager = new EventQueueManager(this);
@ -75,7 +75,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
[Obsolete("!!!FOR DEBUGGING ONLY!!!")] [Obsolete("!!!FOR DEBUGGING ONLY!!!")]
public void StartScript(string ScriptID, string ObjectID) public void StartScript(string ScriptID, string ObjectID)
{ {
m_logger.Status("ScriptEngine", "DEBUG: StartScript: " + ScriptID); m_logger.Status("ScriptEngine", "DEBUG FUNCTION: StartScript: " + ScriptID);
myScriptManager.StartScript(ScriptID, ObjectID); myScriptManager.StartScript(ScriptID, ObjectID);
} }
} }

4
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@ -114,7 +114,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
FileName = ScriptID; FileName = ScriptID;
// * Does script need compile? Send it to LSL compiler first. (TODO: Use (and clean) compiler cache) // * Does script need compile? Send it to LSL compiler first. (TODO: Use (and clean) compiler cache)
myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Script extension: " + System.IO.Path.GetExtension(FileName).ToLower()); //myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Script extension: " + System.IO.Path.GetExtension(FileName).ToLower());
switch (System.IO.Path.GetExtension(FileName).ToLower()) switch (System.IO.Path.GetExtension(FileName).ToLower())
{ {
case ".txt": case ".txt":
@ -174,7 +174,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
/// <returns></returns> /// <returns></returns>
private OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass LoadAndInitAssembly(AppDomain FreeAppDomain, string FileName) private OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass LoadAndInitAssembly(AppDomain FreeAppDomain, string FileName)
{ {
myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Loading Assembly " + FileName); //myScriptEngine.m_logger.Verbose("ScriptEngine", "ScriptManager Loading Assembly " + FileName);
// Load .Net Assembly (.dll) // Load .Net Assembly (.dll)
// Initialize and return it // Initialize and return it