aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-24 02:58:05 +0000
committerMelanie Thielker2008-09-24 02:58:05 +0000
commit218902bedc7f430c8401426a1cee373bfc0b5485 (patch)
treedea8a685e3663c50013c220a120bd20f7aba7e7a /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
parentUpdate svn properties, formatting cleanup. (diff)
downloadopensim-SC_OLD-218902bedc7f430c8401426a1cee373bfc0b5485.zip
opensim-SC_OLD-218902bedc7f430c8401426a1cee373bfc0b5485.tar.gz
opensim-SC_OLD-218902bedc7f430c8401426a1cee373bfc0b5485.tar.bz2
opensim-SC_OLD-218902bedc7f430c8401426a1cee373bfc0b5485.tar.xz
Decouple AsyncCommands from XEngine and the script instance. Make
all methods needed outside the API ststic. Async command processing is now wholly internal to the API. This sets the stage for the next convergence step.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index a6416c6..2e5c627 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -76,7 +76,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
76#pragma warning restore 414 76#pragma warning restore 414
77 private int m_EventLimit; 77 private int m_EventLimit;
78 private bool m_KillTimedOutScripts; 78 private bool m_KillTimedOutScripts;
79 private AsyncCommandManager m_AsyncCommands;
80 bool m_firstStart = true; 79 bool m_firstStart = true;
81 80
82 private static List<XEngine> m_ScriptEngines = 81 private static List<XEngine> m_ScriptEngines =
@@ -142,11 +141,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
142 get { return m_ScriptConfig; } 141 get { return m_ScriptConfig; }
143 } 142 }
144 143
145 public Object AsyncCommands
146 {
147 get { return (Object)m_AsyncCommands; }
148 }
149
150 // 144 //
151 // IRegionModule functions 145 // IRegionModule functions
152 // 146 //
@@ -239,8 +233,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
239 m_Scene.EventManager.OnStopScript += OnStopScript; 233 m_Scene.EventManager.OnStopScript += OnStopScript;
240 m_Scene.EventManager.OnShutdown += OnShutdown; 234 m_Scene.EventManager.OnShutdown += OnShutdown;
241 235
242 m_AsyncCommands = new AsyncCommandManager(this);
243
244 if (m_SleepTime > 0) 236 if (m_SleepTime > 0)
245 { 237 {
246 m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), 238 m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance),
@@ -574,8 +566,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
574 if (!m_Scripts.ContainsKey(itemID)) 566 if (!m_Scripts.ContainsKey(itemID))
575 return; 567 return;
576 568
577 m_AsyncCommands.RemoveScript(localID, itemID);
578
579 IScriptInstance instance=m_Scripts[itemID]; 569 IScriptInstance instance=m_Scripts[itemID];
580 m_Scripts.Remove(itemID); 570 m_Scripts.Remove(itemID);
581 571