diff options
author | lbsa71 | 2009-02-12 09:53:12 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-12 09:53:12 +0000 |
commit | 801da4346aeb3c08969c4845f5c595135a64470a (patch) | |
tree | 2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Region/DataSnapshot | |
parent | Thanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff) | |
download | opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.zip opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2 opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz |
* optimized usings.
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
-rw-r--r-- | OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 20 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/LandSnapshot.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/SnapshotStore.cs | 9 |
7 files changed, 22 insertions, 30 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 9af8914..82b3826 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs | |||
@@ -26,16 +26,15 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | ||
30 | using System.Collections; | 29 | using System.Collections; |
31 | using System.Reflection; | 30 | using System.Reflection; |
32 | using System.Xml; | 31 | using System.Xml; |
33 | using log4net; | 32 | using log4net; |
34 | using OpenSim.Region.Framework.Scenes; | ||
35 | using OpenSim.Framework.Communications.Capabilities; | ||
36 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | ||
37 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework.Communications.Capabilities; | ||
38 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Region.Framework.Scenes; | ||
37 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; | ||
39 | 38 | ||
40 | namespace OpenSim.Region.DataSnapshot | 39 | namespace OpenSim.Region.DataSnapshot |
41 | { | 40 | { |
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 | } |
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs index e805e5b..36f93a3 100644 --- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs | |||
@@ -25,9 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.Xml; | 28 | using System.Xml; |
32 | 29 | ||
33 | namespace OpenSim.Region.DataSnapshot.Interfaces | 30 | namespace OpenSim.Region.DataSnapshot.Interfaces |
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs index 73e41ee..6c66922 100644 --- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs +++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | |||
@@ -25,7 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | using OpenSim.Framework.Communications.Capabilities; | 28 | using OpenSim.Framework.Communications.Capabilities; |
30 | 29 | ||
31 | namespace OpenSim.Region.DataSnapshot | 30 | namespace OpenSim.Region.DataSnapshot |
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 52659e4..fea9f9b 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs | |||
@@ -29,15 +29,14 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Xml; | 31 | using System.Xml; |
32 | using OpenMetaverse; | ||
33 | using log4net; | 32 | using log4net; |
33 | using OpenMetaverse; | ||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications.Cache; | ||
36 | using OpenSim.Region.CoreModules.World.Land; | ||
35 | using OpenSim.Region.DataSnapshot.Interfaces; | 37 | using OpenSim.Region.DataSnapshot.Interfaces; |
36 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.CoreModules.World.Land; | ||
38 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenMetaverse.Packets; | ||
40 | using OpenSim.Framework.Communications.Cache; | ||
41 | 40 | ||
42 | namespace OpenSim.Region.DataSnapshot.Providers | 41 | namespace OpenSim.Region.DataSnapshot.Providers |
43 | { | 42 | { |
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index 949cc38..7cca6ad 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | |||
@@ -30,12 +30,11 @@ using System.Collections.Generic; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Xml; | 31 | using System.Xml; |
32 | using log4net; | 32 | using log4net; |
33 | using OpenMetaverse; | ||
34 | using OpenSim.Framework; | ||
33 | using OpenSim.Region.DataSnapshot.Interfaces; | 35 | using OpenSim.Region.DataSnapshot.Interfaces; |
34 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.CoreModules.World.Land; | ||
37 | using OpenSim.Framework; | ||
38 | using OpenMetaverse; | ||
39 | 38 | ||
40 | namespace OpenSim.Region.DataSnapshot.Providers | 39 | namespace OpenSim.Region.DataSnapshot.Providers |
41 | { | 40 | { |
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs index 22fe067..9886995 100644 --- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs +++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs | |||
@@ -27,12 +27,13 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | ||
31 | using System.Reflection; | ||
30 | using System.Text; | 32 | using System.Text; |
31 | using System.Xml; | 33 | using System.Xml; |
32 | using System.IO; | 34 | using log4net; |
33 | using OpenSim.Region.Framework.Scenes; | ||
34 | using OpenSim.Region.DataSnapshot.Interfaces; | 35 | using OpenSim.Region.DataSnapshot.Interfaces; |
35 | using OpenMetaverse; | 36 | using OpenSim.Region.Framework.Scenes; |
36 | 37 | ||
37 | namespace OpenSim.Region.DataSnapshot | 38 | namespace OpenSim.Region.DataSnapshot |
38 | { | 39 | { |
@@ -42,7 +43,7 @@ namespace OpenSim.Region.DataSnapshot | |||
42 | private String m_directory = "unyuu"; //not an attempt at adding RM references to core SVN, honest | 43 | private String m_directory = "unyuu"; //not an attempt at adding RM references to core SVN, honest |
43 | private Dictionary<Scene, bool> m_scenes = null; | 44 | private Dictionary<Scene, bool> m_scenes = null; |
44 | private List<IDataSnapshotProvider> m_providers = null; | 45 | private List<IDataSnapshotProvider> m_providers = null; |
45 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | private Dictionary<String, String> m_gridinfo = null; | 47 | private Dictionary<String, String> m_gridinfo = null; |
47 | private bool m_cacheEnabled = true; | 48 | private bool m_cacheEnabled = true; |
48 | private string m_listener_port = "9000"; //TODO: Set default port over 9000 | 49 | private string m_listener_port = "9000"; //TODO: Set default port over 9000 |