aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 00:59:22 +0000
committerTedd Hansen2008-02-02 00:59:22 +0000
commit667197f24d1b9b050f1067f8a1fa757b7d46fdf6 (patch)
treea6e6cbcbcace7518f3591de30b9f46d6de9820ea /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
parentThank you very much, Kinoc for : Moved the Listener loop try/catch to a bette... (diff)
downloadopensim-SC-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.zip
opensim-SC-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.tar.gz
opensim-SC-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.tar.bz2
opensim-SC-667197f24d1b9b050f1067f8a1fa757b7d46fdf6.tar.xz
Added OpenSim.32BitLaunch.exe that can be used on 64-bit systems to run OpenSim in 32-bit mode.
Fixed ScriptEngine.Common startup problems.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 9cad388..8030a32 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -41,7 +41,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
41 : base(scriptEngine) 41 : base(scriptEngine)
42 { 42 {
43 base.m_scriptEngine = scriptEngine; 43 base.m_scriptEngine = scriptEngine;
44
45 } 44 }
46 45
47 // KEEP TRACK OF SCRIPTS <int id, whatever script> 46 // KEEP TRACK OF SCRIPTS <int id, whatever script>
@@ -55,7 +54,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
55 public override void _StartScript(uint localID, LLUUID itemID, string Script) 54 public override void _StartScript(uint localID, LLUUID itemID, string Script)
56 { 55 {
57 //IScriptHost root = host.GetRoot(); 56 //IScriptHost root = host.GetRoot();
58 Console.WriteLine("ScriptManager StartScript: localID: " + localID + ", itemID: " + itemID); 57 m_scriptEngine.Log.Debug(m_scriptEngine.ScriptEngineName, "ScriptManager StartScript: localID: " + localID + ", itemID: " + itemID);
59 58
60 // We will initialize and start the script. 59 // We will initialize and start the script.
61 // It will be up to the script itself to hook up the correct events. 60 // It will be up to the script itself to hook up the correct events.
@@ -77,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
77 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource); 76 CompiledScript = m_scriptEngine.m_AppDomainManager.LoadScript(ScriptSource);
78 77
79#if DEBUG 78#if DEBUG
80 Console.WriteLine("Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before); 79 m_scriptEngine.Log.Debug(m_scriptEngine.ScriptEngineName, "Script " + itemID + " occupies {0} bytes", GC.GetTotalMemory(true) - before);
81#endif 80#endif
82 81
83 CompiledScript.Source = Script; 82 CompiledScript.Source = Script;
@@ -110,8 +109,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
110 } 109 }
111 catch (Exception e2) 110 catch (Exception e2)
112 { 111 {
113 m_scriptEngine.Log.Error("ScriptEngine", "Error displaying error in-world: " + e2.ToString()); 112 m_scriptEngine.Log.Error(m_scriptEngine.ScriptEngineName, "Error displaying error in-world: " + e2.ToString());
114 m_scriptEngine.Log.Error("ScriptEngine", 113 m_scriptEngine.Log.Error(m_scriptEngine.ScriptEngineName,
115 "Errormessage: Error compiling script:\r\n" + e.Message.ToString()); 114 "Errormessage: Error compiling script:\r\n" + e.Message.ToString());
116 } 115 }
117 } 116 }
@@ -120,8 +119,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
120 public override void _StopScript(uint localID, LLUUID itemID) 119 public override void _StopScript(uint localID, LLUUID itemID)
121 { 120 {
122 // Stop script 121 // Stop script
123 Console.WriteLine("Stop script localID: " + localID + " LLUID: " + itemID.ToString()); 122#if DEBUG
124 123 m_scriptEngine.Log.Debug(m_scriptEngine.ScriptEngineName, "Stop script localID: " + localID + " LLUID: " + itemID.ToString());
124#endif
125 125
126 // Stop long command on script 126 // Stop long command on script
127 m_scriptEngine.m_ASYNCLSLCommandManager.RemoveScript(localID, itemID); 127 m_scriptEngine.m_ASYNCLSLCommandManager.RemoveScript(localID, itemID);
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
147 } 147 }
148 catch (Exception e) 148 catch (Exception e)
149 { 149 {
150 Console.WriteLine("Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() + 150 m_scriptEngine.Log.Error(m_scriptEngine.ScriptEngineName, "Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() +
151 ": " + e.ToString()); 151 ": " + e.ToString());
152 } 152 }
153 } 153 }