aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs36
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
index f568dc5..1acb1b5 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
@@ -202,9 +202,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
202 } 202 }
203 catch (Exception e) 203 catch (Exception e)
204 { 204 {
205 if (lastScriptEngine != null) 205 if (lastScriptEngine != null)
206 lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown",ScriptEngineName,e.GetType().ToString()); 206 lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown", ScriptEngineName, e.GetType().ToString());
207 throw e; 207 throw e;
208 } 208 }
209 } 209 }
210 } 210 }
@@ -216,7 +216,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
216 public void DoProcessQueue() 216 public void DoProcessQueue()
217 { 217 {
218 foreach (ScriptEngine m_ScriptEngine in 218 foreach (ScriptEngine m_ScriptEngine in
219 new ArrayList(ScriptEngine.ScriptEngines)) 219 new ArrayList(ScriptEngine.ScriptEngines))
220 { 220 {
221 lastScriptEngine = m_ScriptEngine; 221 lastScriptEngine = m_ScriptEngine;
222 222
@@ -290,21 +290,21 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
290 InExecution = false; 290 InExecution = false;
291 } 291 }
292 } 292 }
293 catch (SelfDeleteException sde) 293 catch (SelfDeleteException sde)
294 { 294 {
295 // Make sure this exception isn't consumed here... we need it 295 // Make sure this exception isn't consumed here... we need it
296 throw sde; 296 throw sde;
297 } 297 }
298 catch (TargetInvocationException tie) 298 catch (TargetInvocationException tie)
299 { 299 {
300 // Probably don't need to special case this one 300 // Probably don't need to special case this one
301 throw tie; 301 throw tie;
302 } 302 }
303 catch (Exception e) 303 catch (Exception e)
304 { 304 {
305 InExecution = false; 305 InExecution = false;
306 string text = FormatException(e, QIS.LineMap); 306 string text = FormatException(e, QIS.LineMap);
307 307
308 // DISPLAY ERROR INWORLD 308 // DISPLAY ERROR INWORLD
309 309
310// if (e.InnerException != null) 310// if (e.InnerException != null)
@@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
340 catch (Exception) 340 catch (Exception)
341 { 341 {
342 m_ScriptEngine.m_EventQueueManager. 342 m_ScriptEngine.m_EventQueueManager.
343 m_ScriptEngine.Log.Error("[" + 343 m_ScriptEngine.Log.Error("[" +
344 ScriptEngineName + "]: " + 344 ScriptEngineName + "]: " +
345 "Unable to send text in-world:\r\n" + 345 "Unable to send text in-world:\r\n" +
346 text); 346 text);