From ff7c8551bab7c8a5b7a075c8899c8aeb51035b67 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 17 Dec 2008 18:42:23 +0000
Subject: * remove mono compiler warnings * should work - the last compile
 failure looks like a random glitch...

---
 .../Scenes/SceneCommunicationService.cs            | 34 +++++++++++-----------
 OpenSim/Region/Environment/Scenes/ScenePresence.cs |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 10b0759..b533bb7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes
         private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
         private RegionUp handlerRegionUp = null; // OnRegionUp;
         private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
-        private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
+        //private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
         private LogOffUser handlerLogOffUser = null;
         private GetLandData handlerGetLandData = null; // OnGetLandData
 
@@ -904,10 +904,10 @@ namespace OpenSim.Region.Environment.Scenes
             return currentNeighbours.FindAll(delegate(ulong handle) { return !previousNeighbours.Contains(handle); });
         }
 
-        private List<ulong> CommonNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
-        {
-            return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); });
-        }
+//        private List<ulong> CommonNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
+//        {
+//            return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); });
+//        }
 
         private List<ulong> OldNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
         {
@@ -985,17 +985,17 @@ namespace OpenSim.Region.Environment.Scenes
             return m_commsProvider.GridService.RequestNamedRegions(name, maxNumber);
         }
 
-        private void Dump(string msg, List<ulong> handles)
-        {
-            Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg);
-            foreach (ulong handle in handles)
-            {
-                uint x, y;
-                Utils.LongToUInts(handle, out x, out y);
-                x = x / Constants.RegionSize;
-                y = y / Constants.RegionSize;
-                Console.WriteLine("({0}, {1})", x, y);
-            }
-        }
+//        private void Dump(string msg, List<ulong> handles)
+//        {
+//            Console.WriteLine("-------------- HANDLE DUMP ({0}) ---------", msg);
+//            foreach (ulong handle in handles)
+//            {
+//                uint x, y;
+//                Utils.LongToUInts(handle, out x, out y);
+//                x = x / Constants.RegionSize;
+//                y = y / Constants.RegionSize;
+//                Console.WriteLine("({0}, {1})", x, y);
+//            }
+//        }
     }
 }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index c0779f2..8f6872e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1932,7 +1932,6 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Overridden Methods
 
-        int x = 0;
         public override void Update()
         {
             SendPrimUpdates();
@@ -2436,7 +2435,8 @@ namespace OpenSim.Region.Environment.Scenes
                     // Next, let's close the child agent connections that are too far away.
                     CloseChildAgents(neighbourx, neighboury);
 
-                    AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
+                    //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
+                    m_controllingClient.RequestClientInfo();
 
                     //Console.WriteLine("BEFORE CROSS");
                     //Scene.DumpChildrenSeeds(UUID);
-- 
cgit v1.1