From 748f72326d9a295958bc9ba63bbb1a5d39030ef7 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 27 Jun 2008 23:03:39 +0000
Subject: last round of warning squashing. calling it a day now.

---
 OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 13 +++++++------
 OpenSim/Region/DataSnapshot/EstateSnapshot.cs      |  4 ++--
 OpenSim/Region/DataSnapshot/LandSnapshot.cs        |  4 ++--
 OpenSim/Region/DataSnapshot/ObjectSnapshot.cs      |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/DataSnapshot')

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
 
         //Program objects
         private SnapshotStore m_snapStore = null;
-        private DataRequestHandler m_requests = null;
+        // private DataRequestHandler m_requests = null;
 
         #endregion
 
@@ -144,7 +144,7 @@ namespace OpenSim.Region.DataSnapshot
                     m_passedCheck.Start();
 
                     //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer
-                    m_requests = new DataRequestHandler(scene, this);
+                    // m_requests = new DataRequestHandler(scene, this);
 
                     m_hostname = scene.RegionInfo.ExternalHostName;
                     m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname);
@@ -325,17 +325,18 @@ namespace OpenSim.Region.DataSnapshot
                     m_log.Warn("[DATASNAPSHOT] Ignoring unknown exception " + e.ToString());
                 }
                 byte[] response = new byte[1024];
-                int n = 0;
+                // int n = 0;
                 try
                 {
-                    n = reply.Read(response, 0, 1024);
+                    // n = reply.Read(response, 0, 1024);
+                    reply.Read(response, 0, 1024);
                 }
                 catch (Exception e)
                 {
-                    m_log.Warn("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. " + e.StackTrace);
+                    m_log.WarnFormat("[DATASNAPSHOT] Unable to decode reply from data service. Ignoring. {0}", e.StackTrace);
                 }
                 // This is not quite working, so...
-                string responseStr = Encoding.UTF8.GetString(response);
+                // string responseStr = Encoding.UTF8.GetString(response);
                 m_log.Info("[DATASNAPSHOT] data service notified: " + url);
             }
 
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
          * I don't think anything changes the fields beyond RegionModule PostInit, however.
          */
         private Scene m_scene = null;
-        private DataSnapshotManager m_parent = null;
+        // private DataSnapshotManager m_parent = null;
         private bool m_stale = true;
 
         #region IDataSnapshotProvider Members
@@ -84,7 +84,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
         public void Initialize(Scene scene, DataSnapshotManager parent)
         {
             m_scene = scene;
-            m_parent = parent;
+            // m_parent = parent;
         }
 
         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
     public class LandSnapshot : IDataSnapshotProvider
     {
         private Scene m_scene = null;
-        private DataSnapshotManager m_parent = null;
+        // private DataSnapshotManager m_parent = null;
         //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>();
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private bool m_stale = true;
@@ -106,7 +106,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
         public void Initialize(Scene scene, DataSnapshotManager parent)
         {
             m_scene = scene;
-            m_parent = parent;
+            // m_parent = parent;
 
             //Brought back from the dead for staleness checks.
             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
     public class ObjectSnapshot : IDataSnapshotProvider
     {
         private Scene m_scene = null;
-        private DataSnapshotManager m_parent = null;
+        // private DataSnapshotManager m_parent = null;
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private bool m_stale = true;
 
         public void Initialize(Scene scene, DataSnapshotManager parent)
         {
             m_scene = scene;
-            m_parent = parent;
+            // m_parent = parent;
 
             //To check for staleness, we must catch all incoming client packets.
             m_scene.EventManager.OnNewClient += OnNewClient;
-- 
cgit v1.1