From a3c5f76942270f17e359bfcf8f43c6db3d1f782d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 15 Nov 2011 18:16:43 +0000
Subject: 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
---
OpenSim/Region/Framework/Scenes/Scene.cs | 38 ++------------------------------
1 file changed, 2 insertions(+), 36 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
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
/// Thrown if registration of the region itself fails.
public void RegisterRegionWithGrid()
{
- RegisterCommsEvents();
-
m_sceneGridService.SetScene(this);
GridRegion region = new GridRegion(RegionInfo);
@@ -3196,38 +3194,6 @@ namespace OpenSim.Region.Framework.Scenes
#region RegionComms
///
- /// Register the methods that should be invoked when this scene receives various incoming events
- ///
- 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;
- }
-
- ///
- /// Deregister this scene from receiving incoming region events
- ///
- 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);
- }
-
- ///
/// 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
--
cgit v1.1