aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Instance
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs17
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 8f6108d..da55858 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -35,7 +35,7 @@ using System.Reflection;
35using System.Globalization; 35using System.Globalization;
36using System.Xml; 36using System.Xml;
37using OpenMetaverse; 37using OpenMetaverse;
38using log4net; 38//using log4net;
39using Nini.Config; 39using Nini.Config;
40using Amib.Threading; 40using Amib.Threading;
41using OpenSim.Framework; 41using OpenSim.Framework;
@@ -52,8 +52,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
52{ 52{
53 public class ScriptInstance : IScriptInstance 53 public class ScriptInstance : IScriptInstance
54 { 54 {
55 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
56
55 private IScriptEngine m_Engine; 57 private IScriptEngine m_Engine;
56 private IScriptWorkItem m_CurrentResult=null; 58 private IScriptWorkItem m_CurrentResult = null;
57 private Queue m_EventQueue = new Queue(32); 59 private Queue m_EventQueue = new Queue(32);
58 private bool m_RunEvents = false; 60 private bool m_RunEvents = false;
59 private UUID m_ItemID; 61 private UUID m_ItemID;
@@ -455,6 +457,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
455 } 457 }
456 } 458 }
457 459
460 /// <summary>
461 /// Process the next event queued for this script
462 /// </summary>
463 /// <returns></returns>
458 public object EventProcessor() 464 public object EventProcessor()
459 { 465 {
460 EventParams data = null; 466 EventParams data = null;
@@ -470,6 +476,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
470 if (data.EventName == "timer") 476 if (data.EventName == "timer")
471 m_TimerQueued = false; 477 m_TimerQueued = false;
472 } 478 }
479
480 //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this);
473 481
474 m_DetectParams = data.DetectParams; 482 m_DetectParams = data.DetectParams;
475 483
@@ -721,5 +729,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
721 return m_Apis[name]; 729 return m_Apis[name];
722 return null; 730 return null;
723 } 731 }
732
733 public override string ToString()
734 {
735 return String.Format("{0} {1} on {2}", m_ScriptName, m_ItemID, m_PrimName);
736 }
724 } 737 }
725} 738}