aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/LSOEngine
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/LSOEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs13
2 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
index 45dfd9e..2a846a9 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptEngine.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
44 // We need to override a few things for our DotNetEngine 44 // We need to override a few things for our DotNetEngine
45 public override void Initialise(Scene scene, IConfigSource config) 45 public override void Initialise(Scene scene, IConfigSource config)
46 { 46 {
47 InitializeEngine(scene, config, MainLog.Instance, true, GetScriptManager()); 47 InitializeEngine(scene, config, true, GetScriptManager());
48 } 48 }
49 49
50 public override OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager _GetScriptManager() 50 public override OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.ScriptManager _GetScriptManager()
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index 652c24c..db81487 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
101 } 101 }
102 catch (Exception e) 102 catch (Exception e)
103 { 103 {
104 //m_scriptEngine.Log.Error("ScriptEngine", "Error compiling script: " + e.ToString()); 104 //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString());
105 try 105 try
106 { 106 {
107 // DISPLAY ERROR INWORLD 107 // DISPLAY ERROR INWORLD
@@ -113,9 +113,9 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
113 } 113 }
114 catch (Exception e2) 114 catch (Exception e2)
115 { 115 {
116 m_scriptEngine.Log.Error("ScriptEngine", "Error displaying error in-world: " + e2.ToString()); 116 m_scriptEngine.Log.Error("[ScriptEngine]: Error displaying error in-world: " + e2.ToString());
117 m_scriptEngine.Log.Error("ScriptEngine", 117 m_scriptEngine.Log.Error("[ScriptEngine]: " +
118 "Errormessage: Error compiling script:\r\n" + e.Message.ToString()); 118 "Errormessage: Error compiling script:\r\n" + e.Message.ToString());
119 } 119 }
120 } 120 }
121 } 121 }
@@ -125,7 +125,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
125 // Stop script 125 // Stop script
126 Console.WriteLine("Stop script localID: " + localID + " LLUID: " + itemID.ToString()); 126 Console.WriteLine("Stop script localID: " + localID + " LLUID: " + itemID.ToString());
127 127
128
129 // Stop long command on script 128 // Stop long command on script
130 m_scriptEngine.m_ASYNCLSLCommandManager.RemoveScript(localID, itemID); 129 m_scriptEngine.m_ASYNCLSLCommandManager.RemoveScript(localID, itemID);
131 130
@@ -136,7 +135,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
136 // TEMP: First serialize it 135 // TEMP: First serialize it
137 //GetSerializedScript(localID, itemID); 136 //GetSerializedScript(localID, itemID);
138 137
139
140 try 138 try
141 { 139 {
142 // Get AppDomain 140 // Get AppDomain
@@ -157,7 +155,6 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
157 155
158 public override void Initialize() 156 public override void Initialize()
159 { 157 {
160
161 } 158 }
162 } 159 }
163} \ No newline at end of file 160}