diff options
author | Jeff Ames | 2008-02-20 18:38:20 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-20 18:38:20 +0000 |
commit | a8cfbbe963529728acbab4d9936cb89af380d1ac (patch) | |
tree | 16a72fba3d15556f6702127e7cfb98aa9fb9cf81 /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs | |
parent | Fix exception when reading OpenSim.ini file. (diff) | |
download | opensim-SC-a8cfbbe963529728acbab4d9936cb89af380d1ac.zip opensim-SC-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.gz opensim-SC-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.bz2 opensim-SC-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.xz |
Minor cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs index 830ca99..48c6525 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncLSLCommandManager.cs | |||
@@ -13,7 +13,7 @@ | |||
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
@@ -64,7 +64,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
64 | cmdHandlerThreadCycleSleepms = m_ScriptEngine.ScriptConfigSource.GetInt("AsyncLLCommandLoopms", 50); | 64 | cmdHandlerThreadCycleSleepms = m_ScriptEngine.ScriptConfigSource.GetInt("AsyncLLCommandLoopms", 50); |
65 | } | 65 | } |
66 | 66 | ||
67 | |||
68 | ~AsyncLSLCommandManager() | 67 | ~AsyncLSLCommandManager() |
69 | { | 68 | { |
70 | // Shut down thread | 69 | // Shut down thread |
@@ -215,7 +214,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
215 | // Time has passed? | 214 | // Time has passed? |
216 | if (ts.next < DateTime.Now.Ticks) | 215 | if (ts.next < DateTime.Now.Ticks) |
217 | { | 216 | { |
218 | |||
219 | Console.WriteLine("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); | 217 | Console.WriteLine("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); |
220 | // Add it to queue | 218 | // Add it to queue |
221 | m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "timer", EventQueueManager.llDetectNull, | 219 | m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(ts.localID, ts.itemID, "timer", EventQueueManager.llDetectNull, |
@@ -226,7 +224,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
226 | ts.next = DateTime.Now.Ticks + ts.interval; | 224 | ts.next = DateTime.Now.Ticks + ts.interval; |
227 | } | 225 | } |
228 | } | 226 | } |
229 | } // lock | 227 | } |
230 | } | 228 | } |
231 | 229 | ||
232 | #endregion | 230 | #endregion |
@@ -272,7 +270,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
272 | } | 270 | } |
273 | 271 | ||
274 | httpInfo = iHttpReq.GetNextCompletedRequest(); | 272 | httpInfo = iHttpReq.GetNextCompletedRequest(); |
275 | |||
276 | } | 273 | } |
277 | } | 274 | } |
278 | 275 | ||
@@ -307,11 +304,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
307 | m_ScriptEngine.m_EventQueueManager.AddToScriptQueue( | 304 | m_ScriptEngine.m_EventQueueManager.AddToScriptQueue( |
308 | rInfo.GetLocalID(), rInfo.GetItemID(), "remote_data", EventQueueManager.llDetectNull, resobj | 305 | rInfo.GetLocalID(), rInfo.GetItemID(), "remote_data", EventQueueManager.llDetectNull, resobj |
309 | ); | 306 | ); |
310 | |||
311 | } | 307 | } |
312 | 308 | ||
313 | rInfo = xmlrpc.GetNextCompletedRequest(); | 309 | rInfo = xmlrpc.GetNextCompletedRequest(); |
314 | |||
315 | } | 310 | } |
316 | 311 | ||
317 | SendRemoteDataRequest srdInfo = xmlrpc.GetNextCompletedSRDRequest(); | 312 | SendRemoteDataRequest srdInfo = xmlrpc.GetNextCompletedSRDRequest(); |
@@ -332,14 +327,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
332 | m_ScriptEngine.m_EventQueueManager.AddToScriptQueue( | 327 | m_ScriptEngine.m_EventQueueManager.AddToScriptQueue( |
333 | srdInfo.m_localID, srdInfo.m_itemID, "remote_data", EventQueueManager.llDetectNull, resobj | 328 | srdInfo.m_localID, srdInfo.m_itemID, "remote_data", EventQueueManager.llDetectNull, resobj |
334 | ); | 329 | ); |
335 | |||
336 | } | 330 | } |
337 | 331 | ||
338 | srdInfo = xmlrpc.GetNextCompletedSRDRequest(); | 332 | srdInfo = xmlrpc.GetNextCompletedSRDRequest(); |
339 | |||
340 | } | 333 | } |
341 | |||
342 | |||
343 | } | 334 | } |
344 | } | 335 | } |
345 | 336 | ||
@@ -372,7 +363,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
372 | lInfo.GetLocalID(), lInfo.GetItemID(), "listen", EventQueueManager.llDetectNull, resobj | 363 | lInfo.GetLocalID(), lInfo.GetItemID(), "listen", EventQueueManager.llDetectNull, resobj |
373 | ); | 364 | ); |
374 | } | 365 | } |
375 | |||
376 | } | 366 | } |
377 | } | 367 | } |
378 | } | 368 | } |