Removed unused and mostly commented out SceneCommunicationService methods

As far as I can see, the SCS is only now used for informing neighbours of up/down status and possibly sending child agent updates and close requests

1 files changed, 2 insertions, 36 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 781f922..fb4b545 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1121,8 +1121,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_sceneGraph.Close();
 
-            // De-register with region communications (events cleanup)
-            UnRegisterRegionWithComms();
+            if (!GridService.DeregisterRegion(m_regInfo.RegionID))
+                m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", m_regInfo.RegionName);
 
             // call the base class Close method.
             base.Close();
@@ -1623,8 +1623,6 @@ namespace OpenSim.Region.Framework.Scenes
         /// <exception cref="System.Exception">Thrown if registration of the region itself fails.</exception>
         public void RegisterRegionWithGrid()
         {
-            RegisterCommsEvents();
-
             m_sceneGridService.SetScene(this);
 
             GridRegion region = new GridRegion(RegionInfo);
@@ -3196,38 +3194,6 @@ namespace OpenSim.Region.Framework.Scenes
         #region RegionComms
 
         /// <summary>
-        /// Register the methods that should be invoked when this scene receives various incoming events
-        /// </summary>
-        public void RegisterCommsEvents()
-        {
-            m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent;
-            //m_eventManager.OnRegionUp += OtherRegionUp;
-            //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
-            //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
-            m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid;
-            m_sceneGridService.OnGetLandData += GetLandData;
-        }
-
-        /// <summary>
-        /// Deregister this scene from receiving incoming region events
-        /// </summary>
-        public void UnRegisterRegionWithComms()
-        {
-            m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;
-            //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
-            //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
-            //m_eventManager.OnRegionUp -= OtherRegionUp;
-            m_sceneGridService.OnCloseAgentConnection -= IncomingCloseAgent;
-            m_sceneGridService.OnGetLandData -= GetLandData;
-
-            // this does nothing; should be removed
-            m_sceneGridService.Close();
-
-            if (!GridService.DeregisterRegion(m_regInfo.RegionID))
-                m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", m_regInfo.RegionName);
-        }
-
-        /// <summary>
         /// Do the work necessary to initiate a new user connection for a particular scene.
         /// At the moment, this consists of setting up the caps infrastructure
         /// The return bool should allow for connections to be refused, but as not all calling paths