aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs25
1 files changed, 17 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 9ff2e4d..34f2cc7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
110 private Dictionary<string,IScriptApi> m_Apis = new Dictionary<string,IScriptApi>(); 110 private Dictionary<string,IScriptApi> m_Apis = new Dictionary<string,IScriptApi>();
111 111
112 // Script state 112 // Script state
113 private string m_State="default"; 113 private string m_State = "default";
114 114
115 public Object[] PluginData = new Object[0]; 115 public Object[] PluginData = new Object[0];
116 116
@@ -128,6 +128,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
128 m_minEventDelay = value; 128 m_minEventDelay = value;
129 else 129 else
130 m_minEventDelay = 0.0; 130 m_minEventDelay = 0.0;
131
131 m_eventDelayTicks = (long)(m_minEventDelay * 10000000L); 132 m_eventDelayTicks = (long)(m_minEventDelay * 10000000L);
132 m_nextEventTimeTicks = DateTime.Now.Ticks; 133 m_nextEventTimeTicks = DateTime.Now.Ticks;
133 } 134 }
@@ -298,8 +299,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
298 } 299 }
299 catch (Exception e) 300 catch (Exception e)
300 { 301 {
301 m_log.ErrorFormat("[Script] Error loading assembly {0}\n"+e.ToString(), assembly); 302 m_log.ErrorFormat(
302 throw; 303 "[SCRIPT INSTANCE]: Error loading assembly {0}. Exception {1}{2}",
304 assembly, e.Message, e.StackTrace);
303 } 305 }
304 306
305 try 307 try
@@ -314,9 +316,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
314 part.SetScriptEvents(m_ItemID, 316 part.SetScriptEvents(m_ItemID,
315 (int)m_Script.GetStateEventFlags(State)); 317 (int)m_Script.GetStateEventFlags(State));
316 } 318 }
317 catch (Exception) 319 catch (Exception e)
318 { 320 {
319 // m_log.Error("[Script] Error loading script instance\n"+e.ToString()); 321 m_log.ErrorFormat(
322 "[SCRIPT INSTANCE]: Error loading script instance from assembly {0}. Exception {1}{2}",
323 assembly, e.Message, e.StackTrace);
324
320 return; 325 return;
321 } 326 }
322 327
@@ -378,12 +383,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
378 } 383 }
379 else 384 else
380 { 385 {
381 // m_log.Error("[Script] Unable to load script state: Memory limit exceeded"); 386 m_log.ErrorFormat(
387 "[SCRIPT INSTANCE]: Unable to load script state from assembly {0}: Memory limit exceeded",
388 assembly);
382 } 389 }
383 } 390 }
384 catch (Exception) 391 catch (Exception e)
385 { 392 {
386 // m_log.ErrorFormat("[Script] Unable to load script state from xml: {0}\n"+e.ToString(), xml); 393 m_log.ErrorFormat(
394 "[SCRIPT INSTANCE]: Unable to load script state from assembly {0}. XML is {1}. Exception {2}{3}",
395 assembly, xml, e.Message, e.StackTrace);
387 } 396 }
388 } 397 }
389// else 398// else