diff options
Diffstat (limited to 'OpenSim/Region/DataSnapshot/DataSnapshotManager.cs')
-rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index 735e14b..3013971 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
@@ -31,17 +31,15 @@ using System.Collections.Generic; | |||
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Net; | 32 | using System.Net; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using System.Text; | ||
35 | using System.Xml; | 34 | using System.Xml; |
36 | using OpenMetaverse; | ||
37 | using log4net; | 35 | using log4net; |
38 | using Nini.Config; | 36 | using Nini.Config; |
37 | using OpenMetaverse; | ||
39 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications; |
41 | using OpenSim.Region.DataSnapshot.Interfaces; | 40 | using OpenSim.Region.DataSnapshot.Interfaces; |
42 | using OpenSim.Region.Framework.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.Framework.Scenes; | 42 | using OpenSim.Region.Framework.Scenes; |
44 | using OpenMetaverse.Packets; | ||
45 | 43 | ||
46 | namespace OpenSim.Region.DataSnapshot | 44 | namespace OpenSim.Region.DataSnapshot |
47 | { | 45 | { |
@@ -51,7 +49,7 @@ namespace OpenSim.Region.DataSnapshot | |||
51 | //Information from config | 49 | //Information from config |
52 | private bool m_enabled = false; | 50 | private bool m_enabled = false; |
53 | private bool m_configLoaded = false; | 51 | private bool m_configLoaded = false; |
54 | private List<String> m_disabledModules = new List<String>(); | 52 | private List<string> m_disabledModules = new List<string>(); |
55 | private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>(); | 53 | private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>(); |
56 | private string m_snapsDir = "DataSnapshot"; | 54 | private string m_snapsDir = "DataSnapshot"; |
57 | private string m_exposure_level = "minimum"; | 55 | private string m_exposure_level = "minimum"; |
@@ -123,7 +121,7 @@ namespace OpenSim.Region.DataSnapshot | |||
123 | { | 121 | { |
124 | m_disabledModules.Add(bloody_wanker); | 122 | m_disabledModules.Add(bloody_wanker); |
125 | } | 123 | } |
126 | m_lastUpdate = System.Environment.TickCount; | 124 | m_lastUpdate = Environment.TickCount; |
127 | } | 125 | } |
128 | catch (Exception) | 126 | catch (Exception) |
129 | { | 127 | { |
@@ -363,26 +361,26 @@ namespace OpenSim.Region.DataSnapshot | |||
363 | private void CheckStale() | 361 | private void CheckStale() |
364 | { | 362 | { |
365 | // Wrap check | 363 | // Wrap check |
366 | if (System.Environment.TickCount < m_lastUpdate) | 364 | if (Environment.TickCount < m_lastUpdate) |
367 | { | 365 | { |
368 | m_lastUpdate = System.Environment.TickCount; | 366 | m_lastUpdate = Environment.TickCount; |
369 | } | 367 | } |
370 | 368 | ||
371 | if (m_stales >= m_maxStales) | 369 | if (m_stales >= m_maxStales) |
372 | { | 370 | { |
373 | if (System.Environment.TickCount - m_lastUpdate >= 20000) | 371 | if (Environment.TickCount - m_lastUpdate >= 20000) |
374 | { | 372 | { |
375 | m_stales = 0; | 373 | m_stales = 0; |
376 | m_lastUpdate = System.Environment.TickCount; | 374 | m_lastUpdate = Environment.TickCount; |
377 | MakeEverythingStale(); | 375 | MakeEverythingStale(); |
378 | } | 376 | } |
379 | } | 377 | } |
380 | else | 378 | else |
381 | { | 379 | { |
382 | if (m_lastUpdate + 1000 * m_period < System.Environment.TickCount) | 380 | if (m_lastUpdate + 1000 * m_period < Environment.TickCount) |
383 | { | 381 | { |
384 | m_stales = 0; | 382 | m_stales = 0; |
385 | m_lastUpdate = System.Environment.TickCount; | 383 | m_lastUpdate = Environment.TickCount; |
386 | MakeEverythingStale(); | 384 | MakeEverythingStale(); |
387 | } | 385 | } |
388 | } | 386 | } |