aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs13
-rw-r--r--OpenSim/Region/DataSnapshot/EstateSnapshot.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs4
4 files changed, 13 insertions, 12 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index ae0b5ff..55ef047 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.DataSnapshot
79 79
80 //Program objects 80 //Program objects
81 private SnapshotStore m_snapStore = null; 81 private SnapshotStore m_snapStore = null;
82 private DataRequestHandler m_requests = null; 82 // private DataRequestHandler m_requests = null;
83 83
84 #endregion 84 #endregion
85 85
@@ -144,7 +144,7 @@ namespace OpenSim.Region.DataSnapshot
144 m_passedCheck.Start(); 144 m_passedCheck.Start();
145 145
146 //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer 146 //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer
147 m_requests = new DataRequestHandler(scene, this); 147 // m_requests = new DataRequestHandler(scene, this);
148 148
149 m_hostname = scene.RegionInfo.ExternalHostName; 149 m_hostname = scene.RegionInfo.ExternalHostName;
150 m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname); 150 m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname);
@@ -325,17 +325,18 @@ namespace OpenSim.Region.DataSnapshot
325 m_log.Warn("[DATASNAPSHOT] Ignoring unknown exception " + e.ToString()); 325 m_log.Warn("[DATASNAPSHOT] Ignoring unknown exception " + e.ToString());
326 } 326 }
327 byte[] response = new byte[1024]; 327 byte[] response = new byte[1024];
328 int n = 0; 328 // int n = 0;
329 try 329 try
330 { 330 {
331 n = reply.Read(response, 0, 1024); 331 // n = reply.Read(response, 0, 1024);
332 reply.Read(response, 0, 1024);
332 } 333 }
333 catch (Exception e) 334 catch (Exception e)
334 { 335 {
335 m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace); 336 m_log.WarnFormat("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. {0}", e.StackTrace);
336 } 337 }
337 // This is not quite working, so... 338 // This is not quite working, so...
338 string responseStr = Encoding.UTF8.GetString(response); 339 // string responseStr = Encoding.UTF8.GetString(response);
339 m_log.Info("[DATASNAPSHOT] data service notified: " + url); 340 m_log.Info("[DATASNAPSHOT] data service notified: " + url);
340 } 341 }
341 342
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
index 9a25c1d..99a4a0d 100644
--- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
42 * I don't think anything changes the fields beyond RegionModule PostInit, however. 42 * I don't think anything changes the fields beyond RegionModule PostInit, however.
43 */ 43 */
44 private Scene m_scene = null; 44 private Scene m_scene = null;
45 private DataSnapshotManager m_parent = null; 45 // private DataSnapshotManager m_parent = null;
46 private bool m_stale = true; 46 private bool m_stale = true;
47 47
48 #region IDataSnapshotProvider Members 48 #region IDataSnapshotProvider Members
@@ -84,7 +84,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
84 public void Initialize(Scene scene, DataSnapshotManager parent) 84 public void Initialize(Scene scene, DataSnapshotManager parent)
85 { 85 {
86 m_scene = scene; 86 m_scene = scene;
87 m_parent = parent; 87 // m_parent = parent;
88 } 88 }
89 89
90 public Scene GetParentScene 90 public Scene GetParentScene
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 02e80ba..efc4a84 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
43 public class LandSnapshot : IDataSnapshotProvider 43 public class LandSnapshot : IDataSnapshotProvider
44 { 44 {
45 private Scene m_scene = null; 45 private Scene m_scene = null;
46 private DataSnapshotManager m_parent = null; 46 // private DataSnapshotManager m_parent = null;
47 //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>(); 47 //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>();
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 private bool m_stale = true; 49 private bool m_stale = true;
@@ -106,7 +106,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
106 public void Initialize(Scene scene, DataSnapshotManager parent) 106 public void Initialize(Scene scene, DataSnapshotManager parent)
107 { 107 {
108 m_scene = scene; 108 m_scene = scene;
109 m_parent = parent; 109 // m_parent = parent;
110 110
111 //Brought back from the dead for staleness checks. 111 //Brought back from the dead for staleness checks.
112 m_scene.EventManager.OnNewClient += OnNewClient; 112 m_scene.EventManager.OnNewClient += OnNewClient;
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index e5b2ad4..d2a5051 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -40,14 +40,14 @@ namespace OpenSim.Region.DataSnapshot.Providers
40 public class ObjectSnapshot : IDataSnapshotProvider 40 public class ObjectSnapshot : IDataSnapshotProvider
41 { 41 {
42 private Scene m_scene = null; 42 private Scene m_scene = null;
43 private DataSnapshotManager m_parent = null; 43 // private DataSnapshotManager m_parent = null;
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 private bool m_stale = true; 45 private bool m_stale = true;
46 46
47 public void Initialize(Scene scene, DataSnapshotManager parent) 47 public void Initialize(Scene scene, DataSnapshotManager parent)
48 { 48 {
49 m_scene = scene; 49 m_scene = scene;
50 m_parent = parent; 50 // m_parent = parent;
51 51
52 //To check for staleness, we must catch all incoming client packets. 52 //To check for staleness, we must catch all incoming client packets.
53 m_scene.EventManager.OnNewClient += OnNewClient; 53 m_scene.EventManager.OnNewClient += OnNewClient;