diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 23160cd..c937fab 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -792,7 +792,8 @@ namespace OpenSim.Region.ClientStack | |||
792 | { | 792 | { |
793 | LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10); | 793 | LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10); |
794 | 794 | ||
795 | CrossedRegionPacket newSimPack = (CrossedRegionPacket)PacketPool.Instance.GetPacket(PacketType.CrossedRegion); | 795 | //CrossedRegionPacket newSimPack = (CrossedRegionPacket)PacketPool.Instance.GetPacket(PacketType.CrossedRegion); |
796 | CrossedRegionPacket newSimPack = new CrossedRegionPacket(); | ||
796 | // TODO: don't create new blocks if recycling an old packet | 797 | // TODO: don't create new blocks if recycling an old packet |
797 | newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock(); | 798 | newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock(); |
798 | newSimPack.AgentData.AgentID = AgentId; | 799 | newSimPack.AgentData.AgentID = AgentId; |
@@ -850,7 +851,9 @@ namespace OpenSim.Region.ClientStack | |||
850 | public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, | 851 | public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, |
851 | uint flags, string capsURL) | 852 | uint flags, string capsURL) |
852 | { | 853 | { |
853 | TeleportFinishPacket teleport = (TeleportFinishPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFinish); | 854 | //TeleportFinishPacket teleport = (TeleportFinishPacket)PacketPool.Instance.GetPacket(PacketType.TeleportFinish); |
855 | |||
856 | TeleportFinishPacket teleport = new TeleportFinishPacket(); | ||
854 | teleport.Info.AgentID = AgentId; | 857 | teleport.Info.AgentID = AgentId; |
855 | teleport.Info.RegionHandle = regionHandle; | 858 | teleport.Info.RegionHandle = regionHandle; |
856 | teleport.Info.SimAccess = simAccess; | 859 | teleport.Info.SimAccess = simAccess; |
@@ -887,7 +890,8 @@ namespace OpenSim.Region.ClientStack | |||
887 | /// </summary> | 890 | /// </summary> |
888 | public void SendTeleportLocationStart() | 891 | public void SendTeleportLocationStart() |
889 | { | 892 | { |
890 | TeleportStartPacket tpStart = (TeleportStartPacket)PacketPool.Instance.GetPacket(PacketType.TeleportStart); | 893 | //TeleportStartPacket tpStart = (TeleportStartPacket)PacketPool.Instance.GetPacket(PacketType.TeleportStart); |
894 | TeleportStartPacket tpStart = new TeleportStartPacket(); | ||
891 | tpStart.Info.TeleportFlags = 16; // Teleport via location | 895 | tpStart.Info.TeleportFlags = 16; // Teleport via location |
892 | OutPacket(tpStart, ThrottleOutPacketType.Task); | 896 | OutPacket(tpStart, ThrottleOutPacketType.Task); |
893 | } | 897 | } |