aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index 2f985e4..10959c5 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -318,7 +318,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
318 { 318 {
319 File.Delete(OutFile); 319 File.Delete(OutFile);
320 } 320 }
321 catch (Exception e) 321 catch (Exception e) // NOTLEGIT - Should be just catching FileIOException
322 { 322 {
323 //m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString()); 323 //m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString());
324 throw new Exception("Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString()); 324 throw new Exception("Unable to delete old existring script-file before writing new. Compile aborted: " + e.ToString());
@@ -335,7 +335,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
335 Path.Combine("ScriptEngines", srcFileName), 335 Path.Combine("ScriptEngines", srcFileName),
336 Script); 336 Script);
337 } 337 }
338 catch (Exception ex) 338 catch (Exception ex) // NOTLEGIT - Should be just catching FileIOException
339 { 339 {
340 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception while trying to write script source to file \"" + srcFileName + "\": " + ex.ToString()); 340 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception while trying to write script source to file \"" + srcFileName + "\": " + ex.ToString());
341 } 341 }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index c39d376..b407f8d 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
105 // Fire the first start-event 105 // Fire the first start-event
106 m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); 106 m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { });
107 } 107 }
108 catch (Exception e) 108 catch (Exception e) // LEGIT: User Scripting
109 { 109 {
110 //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString()); 110 //m_scriptEngine.Log.Error("[ScriptEngine]: Error compiling script: " + e.ToString());
111 try 111 try
@@ -117,7 +117,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
117 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition, 117 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition,
118 m_host.Name, m_host.UUID); 118 m_host.Name, m_host.UUID);
119 } 119 }
120 catch (Exception e2) 120 catch (Exception e2) // LEGIT: User Scripting
121 { 121 {
122 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Error displaying error in-world: " + e2.ToString()); 122 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Error displaying error in-world: " + e2.ToString());
123 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: " + 123 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: " +
@@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
154 // Tell AppDomain that we have stopped script 154 // Tell AppDomain that we have stopped script
155 m_scriptEngine.m_AppDomainManager.StopScript(ad); 155 m_scriptEngine.m_AppDomainManager.StopScript(ad);
156 } 156 }
157 catch (Exception e) 157 catch (Exception e) // LEGIT: User Scripting
158 { 158 {
159 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() + 159 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() +
160 ": " + e.ToString()); 160 ": " + e.ToString());