aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs9
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs24
-rw-r--r--OpenSim/Region/DataSnapshot/EstateSnapshot.cs9
-rw-r--r--OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs18
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs10
6 files changed, 26 insertions, 48 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index a59d86a..7e096df 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -26,14 +26,11 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Collections; 29using System.Collections;
32using System.Text; 30using System.Reflection;
33using System.Xml; 31using System.Xml;
32using log4net;
34using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Environment.Scenes;
35using OpenSim.Framework.Servers;
36using OpenSim.Framework.Console;
37 34
38namespace OpenSim.Region.DataSnapshot 35namespace OpenSim.Region.DataSnapshot
39{ 36{
@@ -41,7 +38,7 @@ namespace OpenSim.Region.DataSnapshot
41 { 38 {
42 private Scene m_scene = null; 39 private Scene m_scene = null;
43 private DataSnapshotManager m_externalData = null; 40 private DataSnapshotManager m_externalData = null;
44 private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 42
46 public DataRequestHandler(Scene scene, DataSnapshotManager externalData) 43 public DataRequestHandler(Scene scene, DataSnapshotManager externalData)
47 { 44 {
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
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using System.Xml;
33using System.IO; 31using System.IO;
32using System.Net;
33using System.Reflection;
34using System.Text; 34using System.Text;
35using System.Timers; 35using System.Timers;
36using OpenSim.Framework; 36using System.Xml;
37using libsecondlife;
38using log4net;
39using Nini.Config;
37using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
38using OpenSim.Region.Environment.Interfaces; 41using OpenSim.Region.Environment.Interfaces;
39using OpenSim.Region.Environment.Scenes; 42using OpenSim.Region.Environment.Scenes;
40using Nini.Config;
41using libsecondlife;
42using libsecondlife.Packets;
43 43
44namespace OpenSim.Region.DataSnapshot 44namespace 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
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index b517c16..20ba27c 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -26,16 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml; 29using System.Xml;
32using OpenSim.Region.Environment.Scenes;
33using OpenSim.Region.Environment.Modules.LandManagement;
34using OpenSim.Framework;
35using OpenSim.Framework.Console;
36using OpenSim.Framework.Communications;
37using libsecondlife; 30using libsecondlife;
38using libsecondlife.Packets; 31using OpenSim.Region.Environment.Scenes;
39 32
40namespace OpenSim.Region.DataSnapshot 33namespace OpenSim.Region.DataSnapshot
41{ 34{
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
index 26124ce..8f580fc 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs
@@ -26,12 +26,8 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32using System.Xml; 29using System.Xml;
33using OpenSim.Region.Environment.Scenes; 30using OpenSim.Region.Environment.Scenes;
34using libsecondlife;
35 31
36namespace OpenSim.Region.DataSnapshot 32namespace OpenSim.Region.DataSnapshot
37{ 33{
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index a82f4be..4c17513 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -28,18 +28,14 @@
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text;
32using System.Xml;
33using System.Reflection; 31using System.Reflection;
34 32using System.Xml;
35using OpenSim.Region.Environment.Scenes;
36using OpenSim.Region.Environment.Modules.LandManagement;
37using OpenSim.Region.Environment.Interfaces;
38using OpenSim.Framework;
39using OpenSim.Framework.Console;
40using OpenSim.Framework.Communications;
41using libsecondlife; 33using libsecondlife;
42using libsecondlife.Packets; 34using log4net;
35using OpenSim.Framework;
36using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Region.Environment.Modules.LandManagement;
38using OpenSim.Region.Environment.Scenes;
43 39
44namespace OpenSim.Region.DataSnapshot 40namespace OpenSim.Region.DataSnapshot
45{ 41{
@@ -48,7 +44,7 @@ namespace OpenSim.Region.DataSnapshot
48 private Scene m_scene = null; 44 private Scene m_scene = null;
49 private DataSnapshotManager m_parent = null; 45 private DataSnapshotManager m_parent = null;
50 //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>(); 46 //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>();
51 private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 47 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 48
53 #region Dead code 49 #region Dead code
54 50
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 353a02b..d48ecfd 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -25,14 +25,10 @@
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
28using System;
29using System.Collections.Generic;
30using System.Text;
31using System.Xml;
32using System.Reflection; 28using System.Reflection;
29using System.Xml;
30using log4net;
33using OpenSim.Region.Environment.Scenes; 31using OpenSim.Region.Environment.Scenes;
34using OpenSim.Framework;
35using libsecondlife;
36 32
37namespace OpenSim.Region.DataSnapshot 33namespace OpenSim.Region.DataSnapshot
38{ 34{
@@ -40,7 +36,7 @@ namespace OpenSim.Region.DataSnapshot
40 { 36 {
41 private Scene m_scene = null; 37 private Scene m_scene = null;
42 private DataSnapshotManager m_parent = null; 38 private DataSnapshotManager m_parent = null;
43 private log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 39 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 40
45 public void Initialize(Scene scene, DataSnapshotManager parent) 41 public void Initialize(Scene scene, DataSnapshotManager parent)
46 { 42 {