Fixes Mantis #3220. Thank you kindly, MPallari, for a patch that:

This patch changes InformClientOfNeighbour, CrossRegion and 
SendRegionTeleport methods to virtual.
GenericGridServerConcept
Charles Krinke 2009-02-25 04:38:06 +00:00
parent 3a9173843e
commit 6515d8be0e
1 changed files with 3 additions and 3 deletions

View File

@ -1380,7 +1380,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <summary> /// <summary>
/// Tell the client that the given neighbour region is ready to receive a child agent. /// Tell the client that the given neighbour region is ready to receive a child agent.
/// </summary> /// </summary>
public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint) public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint)
{ {
IPAddress neighbourIP = neighbourEndPoint.Address; IPAddress neighbourIP = neighbourEndPoint.Address;
ushort neighbourPort = (ushort)neighbourEndPoint.Port; ushort neighbourPort = (ushort)neighbourEndPoint.Port;
@ -1417,7 +1417,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return agentData; return agentData;
} }
public void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint externalIPEndPoint, public virtual void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint externalIPEndPoint,
string capsURL) string capsURL)
{ {
Vector3 look = new Vector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10); Vector3 look = new Vector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10);
@ -1507,7 +1507,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(tpLocal, ThrottleOutPacketType.Unknown); OutPacket(tpLocal, ThrottleOutPacketType.Unknown);
} }
public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID,
uint flags, string capsURL) uint flags, string capsURL)
{ {
//TeleportFinishPacket teleport = (TeleportFinishPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFinish); //TeleportFinishPacket teleport = (TeleportFinishPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFinish);