aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/LSOEngine
diff options
context:
space:
mode:
authorAdam Frisby2008-02-06 15:30:02 +0000
committerAdam Frisby2008-02-06 15:30:02 +0000
commitf93fdfa5af0a8dd39f471a97a55209451f7ca7a0 (patch)
tree210ba9757b0759232b4896febc482a9c5675e953 /OpenSim/Region/ScriptEngine/LSOEngine
parent* Added debug message to try track down Mantis#305. (diff)
downloadopensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.zip
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.gz
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.bz2
opensim-SC_OLD-f93fdfa5af0a8dd39f471a97a55209451f7ca7a0.tar.xz
* Marking off which uses of catch (Exception e) is legit and which are not, for later removal/replacement.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/LSOEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
index efe8648..e1fff5c 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/LSO/LSO_Parser.cs
@@ -365,7 +365,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine.LSO
365 bytes[i] = br.ReadByte(); 365 bytes[i] = br.ReadByte();
366 return bytes; 366 return bytes;
367 } 367 }
368 catch (Exception e) 368 catch (Exception e) // NOTLEGIT: No user related exceptions throwable here?
369 { 369 {
370 Common.SendToDebug("Exception: " + e.ToString()); 370 Common.SendToDebug("Exception: " + e.ToString());
371 throw (e); 371 throw (e);
diff --git a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
index db81487..f10a11f 100644
--- a/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/LSOEngine/ScriptManager.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
99 // Fire the first start-event 99 // Fire the first start-event
100 m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { }); 100 m_scriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, "state_entry", EventQueueManager.llDetectNull, new object[] { });
101 } 101 }
102 catch (Exception e) 102 catch (Exception e) // LEGIT - User Script Compilation
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
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
111 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition, 111 World.SimChat(Helpers.StringToField(text), ChatTypeEnum.Say, 0, m_host.AbsolutePosition,
112 m_host.Name, m_host.UUID); 112 m_host.Name, m_host.UUID);
113 } 113 }
114 catch (Exception e2) 114 catch (Exception e2) // LEGIT - User Scripting
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]: " +
@@ -146,7 +146,7 @@ namespace OpenSim.Region.ScriptEngine.LSOEngine
146 // Tell AppDomain that we have stopped script 146 // Tell AppDomain that we have stopped script
147 m_scriptEngine.m_AppDomainManager.StopScript(ad); 147 m_scriptEngine.m_AppDomainManager.StopScript(ad);
148 } 148 }
149 catch (Exception e) 149 catch (Exception e) // LEGIT - Problems caused by User Scripting
150 { 150 {
151 Console.WriteLine("Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() + 151 Console.WriteLine("Exception stopping script localID: " + localID + " LLUID: " + itemID.ToString() +
152 ": " + e.ToString()); 152 ": " + e.ToString());