From 6515d8be0e407dd6e0ff9b4fcdb4ff23437a2506 Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Wed, 25 Feb 2009 04:38:06 +0000 Subject: [PATCH] Fixes Mantis #3220. Thank you kindly, MPallari, for a patch that: This patch changes InformClientOfNeighbour, CrossRegion and SendRegionTeleport methods to virtual. --- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 825e87a697..02e6b8255d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -1380,7 +1380,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// /// Tell the client that the given neighbour region is ready to receive a child agent. /// - public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint) + public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint) { IPAddress neighbourIP = neighbourEndPoint.Address; ushort neighbourPort = (ushort)neighbourEndPoint.Port; @@ -1417,7 +1417,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP 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) { 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); } - 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) { //TeleportFinishPacket teleport = (TeleportFinishPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFinish);