diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase')
6 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs index f3af621..2a0ed37 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandManager.cs | |||
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
115 | Thread.Sleep(cmdHandlerThreadCycleSleepms); | 115 | Thread.Sleep(cmdHandlerThreadCycleSleepms); |
116 | //lock (ScriptEngine.ScriptEngines) | 116 | //lock (ScriptEngine.ScriptEngines) |
117 | //{ | 117 | //{ |
118 | foreach (ScriptEngine se in new ArrayList(ScriptEngine.ScriptEngines)) | 118 | foreach (ScriptEngine se in new ArrayList(ScriptEngine.ScriptEngines)) |
119 | { | 119 | { |
120 | se.m_ASYNCLSLCommandManager.DoOneCmdHandlerPass(); | 120 | se.m_ASYNCLSLCommandManager.DoOneCmdHandlerPass(); |
121 | } | 121 | } |
@@ -176,7 +176,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
176 | 176 | ||
177 | #region Check llRemoteData channels | 177 | #region Check llRemoteData channels |
178 | 178 | ||
179 | 179 | ||
180 | #endregion | 180 | #endregion |
181 | 181 | ||
182 | #region Check llListeners | 182 | #region Check llListeners |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index 4311836..13c9d25 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs | |||
@@ -218,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
218 | objtype |= 0x04; // passive non-moving | 218 | objtype |= 0x04; // passive non-moving |
219 | else | 219 | else |
220 | objtype |= 0x02; // active moving | 220 | objtype |= 0x02; // active moving |
221 | if (ent is IScript) objtype |= 0x08; // Scripted. It COULD have one hidden ... | 221 | if (ent is IScript) objtype |= 0x08; // Scripted. It COULD have one hidden ... |
222 | 222 | ||
223 | if (((ts.type & objtype) != 0) || ((ts.type & objtype) == ts.type)) | 223 | if (((ts.type & objtype) != 0) || ((ts.type & objtype) == ts.type)) |
224 | { | 224 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs index 141e471..6f88e11 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Timer.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
97 | // Old method: Create new list | 97 | // Old method: Create new list |
98 | //List<TimerClass> NewTimers = new List<TimerClass>(); | 98 | //List<TimerClass> NewTimers = new List<TimerClass>(); |
99 | //foreach (TimerClass ts in Timers) | 99 | //foreach (TimerClass ts in Timers) |
100 | //{ | 100 | //{ |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 715e465..fc005ab 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
39 | /// </summary> | 39 | /// </summary> |
40 | public class MaintenanceThread : iScriptEngineFunctionModule | 40 | public class MaintenanceThread : iScriptEngineFunctionModule |
41 | { | 41 | { |
42 | 42 | ||
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | //public ScriptEngine m_ScriptEngine; | 45 | //public ScriptEngine m_ScriptEngine; |
@@ -238,6 +238,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
238 | // get { return _PleaseShutdown; } | 238 | // get { return _PleaseShutdown; } |
239 | // set { _PleaseShutdown = value; } | 239 | // set { _PleaseShutdown = value; } |
240 | //} | 240 | //} |
241 | //private bool _PleaseShutdown = false; | 241 | //private bool _PleaseShutdown = false; |
242 | } | 242 | } |
243 | } | 243 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs index a7ad50d..b0c6314 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptEngine.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
38 | /// <summary> | 38 | /// <summary> |
39 | /// This is the root object for ScriptEngine. Objects access each other trough this class. | 39 | /// This is the root object for ScriptEngine. Objects access each other trough this class. |
40 | /// </summary> | 40 | /// </summary> |
41 | /// | 41 | /// |
42 | [Serializable] | 42 | [Serializable] |
43 | public abstract class ScriptEngine : IRegionModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule | 43 | public abstract class ScriptEngine : IRegionModule, ScriptServerInterfaces.ScriptEngine, iScriptEngineFunctionModule |
44 | { | 44 | { |
@@ -154,7 +154,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
154 | #region IRegionModule | 154 | #region IRegionModule |
155 | 155 | ||
156 | public abstract void Initialise(Scene scene, IConfigSource config); | 156 | public abstract void Initialise(Scene scene, IConfigSource config); |
157 | 157 | ||
158 | public void PostInitialise() | 158 | public void PostInitialise() |
159 | { | 159 | { |
160 | } | 160 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 2233913..c84975a 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
41 | /// Compiles them if necessary | 41 | /// Compiles them if necessary |
42 | /// Execute functions for EventQueueManager (Sends them to script on other AppDomain for execution) | 42 | /// Execute functions for EventQueueManager (Sends them to script on other AppDomain for execution) |
43 | /// </summary> | 43 | /// </summary> |
44 | /// | 44 | /// |
45 | 45 | ||
46 | // This class is as close as you get to the script without being inside script class. It handles all the dirty work for other classes. | 46 | // This class is as close as you get to the script without being inside script class. It handles all the dirty work for other classes. |
47 | // * Keeps track of running scripts | 47 | // * Keeps track of running scripts |
@@ -212,7 +212,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
212 | if (LUQueue.Count > 0) | 212 | if (LUQueue.Count > 0) |
213 | { | 213 | { |
214 | LUStruct item = LUQueue.Dequeue(); | 214 | LUStruct item = LUQueue.Dequeue(); |
215 | 215 | ||
216 | if (item.Action == LUType.Unload) | 216 | if (item.Action == LUType.Unload) |
217 | { | 217 | { |
218 | _StopScript(item.localID, item.itemID); | 218 | _StopScript(item.localID, item.itemID); |
@@ -224,7 +224,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
224 | } | 224 | } |
225 | } | 225 | } |
226 | } | 226 | } |
227 | 227 | ||
228 | #endregion | 228 | #endregion |
229 | 229 | ||
230 | #region Helper functions | 230 | #region Helper functions |