From 20f26eeb17da708a58a26629e8e9b08a5e9a6950 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 15 Nov 2011 17:38:55 +0000 Subject: [PATCH] Remove unused RegionCommsListener/IRegionCommsListener. All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time. --- OpenSim/Framework/IRegionCommsListener.cs | 68 ------ OpenSim/Framework/RegionCommsListener.cs | 204 ------------------ .../Scenes/SceneCommunicationService.cs | 3 - 3 files changed, 275 deletions(-) delete mode 100644 OpenSim/Framework/IRegionCommsListener.cs delete mode 100644 OpenSim/Framework/RegionCommsListener.cs diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs deleted file mode 100644 index cd59c63db6..0000000000 --- a/OpenSim/Framework/IRegionCommsListener.cs +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System.Collections.Generic; -using OpenMetaverse; - -namespace OpenSim.Framework -{ - public delegate void ExpectUserDelegate(AgentCircuitData agent); - - - public delegate void UpdateNeighbours(List neighbours); - - public delegate void AgentCrossing(UUID agentID, Vector3 position, bool isFlying); - - public delegate void PrimCrossing(UUID primID, Vector3 position, bool isPhysical); - - public delegate void AcknowledgeAgentCross(UUID agentID); - - public delegate void AcknowledgePrimCross(UUID PrimID); - - public delegate bool CloseAgentConnection(UUID agentID); - - public delegate bool ChildAgentUpdate(ChildAgentDataUpdate cAgentData); - - public delegate void LogOffUser(UUID agentID, UUID regionSecret, string message); - - public delegate LandData GetLandData(uint x, uint y); - - public interface IRegionCommsListener - { - event ExpectUserDelegate OnExpectUser; - event GenericCall2 OnExpectChildAgent; - event AgentCrossing OnAvatarCrossingIntoRegion; - event PrimCrossing OnPrimCrossingIntoRegion; - event AcknowledgeAgentCross OnAcknowledgeAgentCrossed; - event AcknowledgePrimCross OnAcknowledgePrimCrossed; - event UpdateNeighbours OnNeighboursUpdate; - event CloseAgentConnection OnCloseAgentConnection; - event ChildAgentUpdate OnChildAgentUpdate; - event LogOffUser OnLogOffUser; - event GetLandData OnGetLandData; - } -} diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs deleted file mode 100644 index 3e0955d073..0000000000 --- a/OpenSim/Framework/RegionCommsListener.cs +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using System.Collections.Generic; -using OpenMetaverse; - -namespace OpenSim.Framework -{ - /// - /// Sandbox mode region comms listener. There is one of these per region - /// - public class RegionCommsListener : IRegionCommsListener - { - public string debugRegionName = String.Empty; - private AcknowledgeAgentCross handlerAcknowledgeAgentCrossed = null; // OnAcknowledgeAgentCrossed; - private AcknowledgePrimCross handlerAcknowledgePrimCrossed = null; // OnAcknowledgePrimCrossed; - private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion; - private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; - private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection; - private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent; - private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser - private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate; -// private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; - private LogOffUser handlerLogOffUser = null; - private GetLandData handlerGetLandData = null; - - #region IRegionCommsListener Members - - public event ExpectUserDelegate OnExpectUser; - public event GenericCall2 OnExpectChildAgent; - public event AgentCrossing OnAvatarCrossingIntoRegion; - public event PrimCrossing OnPrimCrossingIntoRegion; - public event UpdateNeighbours OnNeighboursUpdate; - public event AcknowledgeAgentCross OnAcknowledgeAgentCrossed; - public event AcknowledgePrimCross OnAcknowledgePrimCrossed; - public event CloseAgentConnection OnCloseAgentConnection; - public event ChildAgentUpdate OnChildAgentUpdate; - public event LogOffUser OnLogOffUser; - public event GetLandData OnGetLandData; - - #endregion - - /// - /// - /// - /// - /// - public virtual bool TriggerExpectUser(AgentCircuitData agent) - { - handlerExpectUser = OnExpectUser; - if (handlerExpectUser != null) - { - handlerExpectUser(agent); - return true; - } - - return false; - } - - // From User Server - public virtual void TriggerLogOffUser(UUID agentID, UUID RegionSecret, string message) - { - handlerLogOffUser = OnLogOffUser; - if (handlerLogOffUser != null) - { - handlerLogOffUser(agentID, RegionSecret, message); - } - - } - - public virtual bool TriggerChildAgentUpdate(ChildAgentDataUpdate cAgentData) - { - handlerChildAgentUpdate = OnChildAgentUpdate; - if (handlerChildAgentUpdate != null) - { - handlerChildAgentUpdate(cAgentData); - return true; - } - return false; - } - - public virtual bool TriggerExpectAvatarCrossing(UUID agentID, Vector3 position, bool isFlying) - { - handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion; - if (handlerAvatarCrossingIntoRegion != null) - { - handlerAvatarCrossingIntoRegion(agentID, position, isFlying); - return true; - } - return false; - } - - public virtual bool TriggerAcknowledgeAgentCrossed(UUID agentID) - { - handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed; - if (handlerAcknowledgeAgentCrossed != null) - { - handlerAcknowledgeAgentCrossed(agentID); - return true; - } - return false; - } - - public virtual bool TriggerAcknowledgePrimCrossed(UUID primID) - { - handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed; - if (handlerAcknowledgePrimCrossed != null) - { - handlerAcknowledgePrimCrossed(primID); - return true; - } - return false; - } - - public virtual bool TriggerCloseAgentConnection(UUID agentID) - { - handlerCloseAgentConnection = OnCloseAgentConnection; - if (handlerCloseAgentConnection != null) - { - handlerCloseAgentConnection(agentID); - return true; - } - return false; - } - - /// - /// - /// - /// TODO: Doesnt take any args?? - /// - public virtual bool TriggerExpectChildAgent() - { - handlerExpectChildAgent = OnExpectChildAgent; - if (handlerExpectChildAgent != null) - { - handlerExpectChildAgent(); - return true; - } - - return false; - } - - /// - /// - /// - /// Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me - /// - /// - public virtual bool TriggerOnNeighboursUpdate(List neighbours) - { - handlerNeighboursUpdate = OnNeighboursUpdate; - if (handlerNeighboursUpdate != null) - { - handlerNeighboursUpdate(neighbours); - return true; - } - - return false; - } - - public bool TriggerTellRegionToCloseChildConnection(UUID agentID) - { - handlerCloseAgentConnection = OnCloseAgentConnection; - if (handlerCloseAgentConnection != null) - return handlerCloseAgentConnection(agentID); - - return false; - } - - public LandData TriggerGetLandData(uint x, uint y) - { - handlerGetLandData = OnGetLandData; - if (handlerGetLandData != null) - return handlerGetLandData(x, y); - - return null; - } - } -} diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index ff45b1fa7c..3d56f9bdd1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -55,9 +55,6 @@ namespace OpenSim.Region.Framework.Scenes protected RegionInfo m_regionInfo; protected Scene m_scene; - - protected RegionCommsListener regionCommsHost; - protected List m_agentsInTransit; ///