From e31d7fe42474c96c77521a9b542ff487e8dfbf4c Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Mon, 14 Nov 2011 18:16:14 +0000 Subject: [PATCH] minor: remove some mono compiler warnings --- OpenSim/Region/Framework/Scenes/Scene.cs | 40 +--------- .../Scenes/SceneCommunicationService.cs | 80 ------------------- 2 files changed, 2 insertions(+), 118 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c9e93acbe3..d76ee1ce03 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1100,8 +1100,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(); @@ -1606,8 +1606,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); @@ -3169,40 +3167,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.KiPrimitive += SendKillObject; - m_sceneGridService.OnGetLandData += GetLandData; - } - - /// - /// Deregister this scene from receiving incoming region events - /// - public void UnRegisterRegionWithComms() - { - m_sceneGridService.KiPrimitive -= SendKillObject; - 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 diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 99c40391cd..b3ea237f65 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -59,81 +59,12 @@ namespace OpenSim.Region.Framework.Scenes protected Scene m_scene; protected List m_agentsInTransit; - /// - /// A user will arrive shortly, set up appropriate credentials so it can connect - /// -// public event ExpectUserDelegate OnExpectUser; - - /// - /// A Prim will arrive shortly - /// - public event CloseAgentConnection OnCloseAgentConnection; - - /// - /// A new prim has arrived - /// -// public event PrimCrossing OnPrimCrossingIntoRegion; - - ///// - ///// A New Region is up and available - ///// - //public event RegionUp OnRegionUp; - - /// - /// We have a child agent for this avatar and we're getting a status update about it - /// -// public event ChildAgentUpdate OnChildAgentUpdate; - //public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; - - /// - /// Time to log one of our users off. Grid Service sends this mostly - /// - public event LogOffUser OnLogOffUser; - - /// - /// A region wants land data from us! - /// - public event GetLandData OnGetLandData; - -// private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion; -// private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser; -// private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection; -// private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; - //private RegionUp handlerRegionUp = null; // OnRegionUp; -// private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; - //private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar; -// private LogOffUser handlerLogOffUser = null; -// private GetLandData handlerGetLandData = null; // OnGetLandData - - public KiPrimitiveDelegate KiPrimitive; - - public SceneCommunicationService() - { - } - public void SetScene(Scene s) { m_scene = s; m_regionInfo = s.RegionInfo; } - /// - /// Register a region with the grid - /// - /// - /// Thrown if region registration fails. - public void RegisterRegion(IInterregionCommsOut comms_out, RegionInfo regionInfos) - { - } - - /// - /// This region is shutting down, de-register all events! - /// De-Register region from Grid! - /// - public void Close() - { - } - public delegate void InformNeighbourThatRegionUpDelegate(INeighbourService nService, RegionInfo region, ulong regionhandle); private void InformNeighborsThatRegionisUpCompleted(IAsyncResult iar) @@ -169,7 +100,6 @@ namespace OpenSim.Region.Framework.Scenes } } - public void InformNeighborsThatRegionisUp(INeighbourService neighbourService, RegionInfo region) { //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); @@ -186,7 +116,6 @@ namespace OpenSim.Region.Framework.Scenes } public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, GridRegion dest); - /// /// This informs all neighboring regions about the settings of it's child agent. @@ -251,19 +180,11 @@ namespace OpenSim.Region.Framework.Scenes } - //public delegate void SendCloseChildAgentDelegate(UUID agentID, ulong regionHandle); - //private void SendCloseChildAgentCompleted(IAsyncResult iar) - //{ - // SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState; - // icon.EndInvoke(iar); - //} - /// /// Closes a child agent on a given region /// protected void SendCloseChildAgent(UUID agentID, ulong regionHandle) { - m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); // let's do our best, but there's not much we can do if the neighbour doesn't accept. @@ -295,6 +216,5 @@ namespace OpenSim.Region.Framework.Scenes { return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); } - } }