diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs index cb9ce44..682763b 100644 --- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | |||
@@ -28,18 +28,18 @@ | |||
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | ||
32 | using System.Xml; | ||
33 | using System.IO; | 31 | using System.IO; |
32 | using System.Net; | ||
33 | using System.Reflection; | ||
34 | using System.Text; | 34 | using System.Text; |
35 | using System.Timers; | 35 | using System.Timers; |
36 | using OpenSim.Framework; | 36 | using System.Xml; |
37 | using libsecondlife; | ||
38 | using log4net; | ||
39 | using Nini.Config; | ||
37 | using OpenSim.Framework.Communications; | 40 | using OpenSim.Framework.Communications; |
38 | using OpenSim.Region.Environment.Interfaces; | 41 | using OpenSim.Region.Environment.Interfaces; |
39 | using OpenSim.Region.Environment.Scenes; | 42 | using OpenSim.Region.Environment.Scenes; |
40 | using Nini.Config; | ||
41 | using libsecondlife; | ||
42 | using libsecondlife.Packets; | ||
43 | 43 | ||
44 | namespace OpenSim.Region.DataSnapshot | 44 | namespace OpenSim.Region.DataSnapshot |
45 | { | 45 | { |
@@ -47,13 +47,13 @@ namespace OpenSim.Region.DataSnapshot | |||
47 | { | 47 | { |
48 | #region Class members | 48 | #region Class members |
49 | private List<Scene> m_scenes = new List<Scene>(); | 49 | private List<Scene> m_scenes = new List<Scene>(); |
50 | private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 50 | private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | private bool m_enabled = false; | 51 | private bool m_enabled = false; |
52 | private bool m_configLoaded = false; | 52 | private bool m_configLoaded = false; |
53 | internal object m_syncInit = new object(); | 53 | internal object m_syncInit = new object(); |
54 | private DataRequestHandler m_requests = null; | 54 | private DataRequestHandler m_requests = null; |
55 | private Dictionary<Scene, List<IDataSnapshotProvider>> m_dataproviders = new Dictionary<Scene, List<IDataSnapshotProvider>>(); | 55 | private Dictionary<Scene, List<IDataSnapshotProvider>> m_dataproviders = new Dictionary<Scene, List<IDataSnapshotProvider>>(); |
56 | private Dictionary<String, String> m_gridinfo = new Dictionary<String, String>(); | 56 | private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>(); |
57 | //private int m_oldestSnapshot = 0; | 57 | //private int m_oldestSnapshot = 0; |
58 | private int m_maxSnapshots = 500; | 58 | private int m_maxSnapshots = 500; |
59 | private int m_lastSnapshot = 0; | 59 | private int m_lastSnapshot = 0; |
@@ -63,7 +63,7 @@ namespace OpenSim.Region.DataSnapshot | |||
63 | private string m_hostname = "127.0.0.1"; | 63 | private string m_hostname = "127.0.0.1"; |
64 | private Timer m_periodic = null; | 64 | private Timer m_periodic = null; |
65 | private int m_period = 60; // in seconds | 65 | private int m_period = 60; // in seconds |
66 | private List<String> m_disabledModules = new List<String>(); | 66 | private List<string> m_disabledModules = new List<string>(); |
67 | #endregion | 67 | #endregion |
68 | 68 | ||
69 | #region IRegionModule | 69 | #region IRegionModule |
@@ -72,7 +72,7 @@ namespace OpenSim.Region.DataSnapshot | |||
72 | 72 | ||
73 | } | 73 | } |
74 | 74 | ||
75 | public void Initialise(Scene scene, Nini.Config.IConfigSource config) | 75 | public void Initialise(Scene scene, IConfigSource config) |
76 | { | 76 | { |
77 | if (!m_scenes.Contains(scene)) | 77 | if (!m_scenes.Contains(scene)) |
78 | m_scenes.Add(scene); | 78 | m_scenes.Add(scene); |
@@ -495,7 +495,7 @@ namespace OpenSim.Region.DataSnapshot | |||
495 | { | 495 | { |
496 | reply = cli.Request(); | 496 | reply = cli.Request(); |
497 | } | 497 | } |
498 | catch (System.Net.WebException) | 498 | catch (WebException) |
499 | { | 499 | { |
500 | m_log.Warn("[DATASNAPSHOT] Unable to notify " + url); | 500 | m_log.Warn("[DATASNAPSHOT] Unable to notify " + url); |
501 | } | 501 | } |
@@ -514,7 +514,7 @@ namespace OpenSim.Region.DataSnapshot | |||
514 | m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace); | 514 | m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace); |
515 | } | 515 | } |
516 | // This is not quite working, so... | 516 | // This is not quite working, so... |
517 | string responseStr = System.Text.ASCIIEncoding.UTF8.GetString(response); | 517 | string responseStr = ASCIIEncoding.UTF8.GetString(response); |
518 | m_log.Info("[DATASNAPSHOT] data service notified: " + url); | 518 | m_log.Info("[DATASNAPSHOT] data service notified: " + url); |
519 | } | 519 | } |
520 | 520 | ||