diff options
author | Dr Scofield | 2008-06-27 23:03:39 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 23:03:39 +0000 |
commit | 748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch) | |
tree | 58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase | |
parent | more warnings to go. (diff) | |
download | opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2 opensim-SC_OLD-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz |
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index fc005ab..ef87b2f 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |||
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
125 | } | 125 | } |
126 | } | 126 | } |
127 | 127 | ||
128 | private ScriptEngine lastScriptEngine; // Keep track of what ScriptEngine instance we are at so we can give exception | 128 | // private ScriptEngine lastScriptEngine; // Keep track of what ScriptEngine instance we are at so we can give exception |
129 | /// <summary> | 129 | /// <summary> |
130 | /// A thread should run in this loop and check all running scripts | 130 | /// A thread should run in this loop and check all running scripts |
131 | /// </summary> | 131 | /// </summary> |
@@ -171,7 +171,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
171 | //{ | 171 | //{ |
172 | foreach (ScriptEngine m_ScriptEngine in new ArrayList(ScriptEngine.ScriptEngines)) | 172 | foreach (ScriptEngine m_ScriptEngine in new ArrayList(ScriptEngine.ScriptEngines)) |
173 | { | 173 | { |
174 | lastScriptEngine = m_ScriptEngine; | 174 | // lastScriptEngine = m_ScriptEngine; |
175 | // Re-reading config every x seconds | 175 | // Re-reading config every x seconds |
176 | if (MaintenanceLoopTicks_Other_Count >= MaintenanceLoopTicks_Other) | 176 | if (MaintenanceLoopTicks_Other_Count >= MaintenanceLoopTicks_Other) |
177 | { | 177 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 366aaf1..eed0b86 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
59 | 59 | ||
60 | private Thread scriptLoadUnloadThread; | 60 | private Thread scriptLoadUnloadThread; |
61 | private static Thread staticScriptLoadUnloadThread; | 61 | private static Thread staticScriptLoadUnloadThread; |
62 | private int scriptLoadUnloadThread_IdleSleepms; | 62 | // private int scriptLoadUnloadThread_IdleSleepms; |
63 | private Queue<LUStruct> LUQueue = new Queue<LUStruct>(); | 63 | private Queue<LUStruct> LUQueue = new Queue<LUStruct>(); |
64 | private static bool PrivateThread; | 64 | private static bool PrivateThread; |
65 | private int LoadUnloadMaxQueueSize; | 65 | private int LoadUnloadMaxQueueSize; |
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
100 | 100 | ||
101 | public void ReadConfig() | 101 | public void ReadConfig() |
102 | { | 102 | { |
103 | scriptLoadUnloadThread_IdleSleepms = m_scriptEngine.ScriptConfigSource.GetInt("ScriptLoadUnloadLoopms", 30); | 103 | // scriptLoadUnloadThread_IdleSleepms = m_scriptEngine.ScriptConfigSource.GetInt("ScriptLoadUnloadLoopms", 30); |
104 | // TODO: Requires sharing of all ScriptManagers to single thread | 104 | // TODO: Requires sharing of all ScriptManagers to single thread |
105 | PrivateThread = true; // m_scriptEngine.ScriptConfigSource.GetBoolean("PrivateScriptLoadUnloadThread", false); | 105 | PrivateThread = true; // m_scriptEngine.ScriptConfigSource.GetBoolean("PrivateScriptLoadUnloadThread", false); |
106 | LoadUnloadMaxQueueSize = m_scriptEngine.ScriptConfigSource.GetInt("LoadUnloadMaxQueueSize", 100); | 106 | LoadUnloadMaxQueueSize = m_scriptEngine.ScriptConfigSource.GetInt("LoadUnloadMaxQueueSize", 100); |
@@ -245,7 +245,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
245 | 245 | ||
246 | #region Start/Stop/Reset script | 246 | #region Start/Stop/Reset script |
247 | 247 | ||
248 | private readonly Object startStopLock = new Object(); | 248 | // private readonly Object startStopLock = new Object(); |
249 | 249 | ||
250 | /// <summary> | 250 | /// <summary> |
251 | /// Fetches, loads and hooks up a script to an objects events | 251 | /// Fetches, loads and hooks up a script to an objects events |