diff options
author | Charles Krinke | 2009-02-25 04:38:06 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-25 04:38:06 +0000 |
commit | 6515d8be0e407dd6e0ff9b4fcdb4ff23437a2506 (patch) | |
tree | ec755408f59ef3b7f6d63c836cf8790c82417af3 | |
parent | Comment out HttpProxy and HttpProxyExceptions in OpenSim.ini.example. (diff) | |
download | opensim-SC-6515d8be0e407dd6e0ff9b4fcdb4ff23437a2506.zip opensim-SC-6515d8be0e407dd6e0ff9b4fcdb4ff23437a2506.tar.gz opensim-SC-6515d8be0e407dd6e0ff9b4fcdb4ff23437a2506.tar.bz2 opensim-SC-6515d8be0e407dd6e0ff9b4fcdb4ff23437a2506.tar.xz |
Fixes Mantis #3220. Thank you kindly, MPallari, for a patch that:
This patch changes InformClientOfNeighbour, CrossRegion and
SendRegionTeleport methods to virtual.
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 825e87a..02e6b82 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1380,7 +1380,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1380 | /// <summary> | 1380 | /// <summary> |
1381 | /// Tell the client that the given neighbour region is ready to receive a child agent. | 1381 | /// Tell the client that the given neighbour region is ready to receive a child agent. |
1382 | /// </summary> | 1382 | /// </summary> |
1383 | public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint) | 1383 | public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint) |
1384 | { | 1384 | { |
1385 | IPAddress neighbourIP = neighbourEndPoint.Address; | 1385 | IPAddress neighbourIP = neighbourEndPoint.Address; |
1386 | ushort neighbourPort = (ushort)neighbourEndPoint.Port; | 1386 | ushort neighbourPort = (ushort)neighbourEndPoint.Port; |
@@ -1417,7 +1417,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1417 | return agentData; | 1417 | return agentData; |
1418 | } | 1418 | } |
1419 | 1419 | ||
1420 | public void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint externalIPEndPoint, | 1420 | public virtual void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint externalIPEndPoint, |
1421 | string capsURL) | 1421 | string capsURL) |
1422 | { | 1422 | { |
1423 | Vector3 look = new Vector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10); | 1423 | Vector3 look = new Vector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10); |
@@ -1507,7 +1507,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1507 | OutPacket(tpLocal, ThrottleOutPacketType.Unknown); | 1507 | OutPacket(tpLocal, ThrottleOutPacketType.Unknown); |
1508 | } | 1508 | } |
1509 | 1509 | ||
1510 | public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, | 1510 | public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, |
1511 | uint flags, string capsURL) | 1511 | uint flags, string capsURL) |
1512 | { | 1512 | { |
1513 | //TeleportFinishPacket teleport = (TeleportFinishPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFinish); | 1513 | //TeleportFinishPacket teleport = (TeleportFinishPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFinish); |