Remove unused RegionCommsListener/IRegionCommsListener.
All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.0.7.2-post-fixes
Justin Clark-Casey (justincc)
parent
310c2403b0
commit
78739067d1
|
|
@ -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<RegionInfo> 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -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
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Sandbox mode region comms listener. There is one of these per region
|
|
||||||
/// </summary>
|
|
||||||
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
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="agent"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
/// <remarks>TODO: Doesnt take any args??</remarks>
|
|
||||||
/// <returns></returns>
|
|
||||||
public virtual bool TriggerExpectChildAgent()
|
|
||||||
{
|
|
||||||
handlerExpectChildAgent = OnExpectChildAgent;
|
|
||||||
if (handlerExpectChildAgent != null)
|
|
||||||
{
|
|
||||||
handlerExpectChildAgent();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
/// <remarks>Added to avoid a unused compiler warning on OnNeighboursUpdate, TODO: Check me</remarks>
|
|
||||||
/// <param name="neighbours"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -57,9 +57,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
protected RegionInfo m_regionInfo;
|
protected RegionInfo m_regionInfo;
|
||||||
protected Scene m_scene;
|
protected Scene m_scene;
|
||||||
|
|
||||||
protected RegionCommsListener regionCommsHost;
|
|
||||||
|
|
||||||
protected List<UUID> m_agentsInTransit;
|
protected List<UUID> m_agentsInTransit;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue