aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-12-10 15:17:34 +0000
committerMelanie2011-12-10 15:17:34 +0000
commit3a91085ac2364c80b53275886c8130a4b1f0e62f (patch)
treea8474ab6c3ca3e46905594e880308b00006e263a
parentminor: remove a mono compiler warning (diff)
downloadopensim-SC_OLD-3a91085ac2364c80b53275886c8130a4b1f0e62f.zip
opensim-SC_OLD-3a91085ac2364c80b53275886c8130a4b1f0e62f.tar.gz
opensim-SC_OLD-3a91085ac2364c80b53275886c8130a4b1f0e62f.tar.bz2
opensim-SC_OLD-3a91085ac2364c80b53275886c8130a4b1f0e62f.tar.xz
Implement handler for TeleportCancel inbound packet
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs12
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs1
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs1
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs1
5 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index a070aa6..258b3eb 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -84,6 +84,8 @@ namespace OpenSim.Framework
84 public delegate void TeleportLandmarkRequest( 84 public delegate void TeleportLandmarkRequest(
85 IClientAPI remoteClient, AssetLandmark lm); 85 IClientAPI remoteClient, AssetLandmark lm);
86 86
87 public delegate void TeleportCancel(IClientAPI remoteClient);
88
87 public delegate void DisconnectUser(); 89 public delegate void DisconnectUser();
88 90
89 public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID); 91 public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID);
@@ -788,6 +790,7 @@ namespace OpenSim.Framework
788 event RequestAvatarProperties OnRequestAvatarProperties; 790 event RequestAvatarProperties OnRequestAvatarProperties;
789 event SetAlwaysRun OnSetAlwaysRun; 791 event SetAlwaysRun OnSetAlwaysRun;
790 event TeleportLandmarkRequest OnTeleportLandmarkRequest; 792 event TeleportLandmarkRequest OnTeleportLandmarkRequest;
793 event TeleportCancel OnTeleportCancel;
791 event DeRezObject OnDeRezObject; 794 event DeRezObject OnDeRezObject;
792 event Action<IClientAPI> OnRegionHandShakeReply; 795 event Action<IClientAPI> OnRegionHandShakeReply;
793 event GenericCall1 OnRequestWearables; 796 event GenericCall1 OnRequestWearables;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1d4be8a..7223438 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -140,6 +140,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
140 public event RequestMapName OnMapNameRequest; 140 public event RequestMapName OnMapNameRequest;
141 public event TeleportLocationRequest OnTeleportLocationRequest; 141 public event TeleportLocationRequest OnTeleportLocationRequest;
142 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 142 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
143 public event TeleportCancel OnTeleportCancel;
143 public event DisconnectUser OnDisconnectUser; 144 public event DisconnectUser OnDisconnectUser;
144 public event RequestAvatarProperties OnRequestAvatarProperties; 145 public event RequestAvatarProperties OnRequestAvatarProperties;
145 public event SetAlwaysRun OnSetAlwaysRun; 146 public event SetAlwaysRun OnSetAlwaysRun;
@@ -5173,6 +5174,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5173 AddLocalPacketHandler(PacketType.MapBlockRequest, HandleMapBlockRequest, false); 5174 AddLocalPacketHandler(PacketType.MapBlockRequest, HandleMapBlockRequest, false);
5174 AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest, false); 5175 AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest, false);
5175 AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest); 5176 AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest);
5177 AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel);
5176 AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest); 5178 AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest);
5177 AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false); 5179 AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false);
5178 AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest); 5180 AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest);
@@ -8409,6 +8411,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8409 return true; 8411 return true;
8410 } 8412 }
8411 8413
8414 private bool HandleTeleportCancel(IClientAPI sender, Packet Pack)
8415 {
8416 TeleportCancel handlerTeleportCancel = OnTeleportCancel;
8417 if (handlerTeleportCancel != null)
8418 {
8419 handlerTeleportCancel(this);
8420 }
8421 return true;
8422 }
8423
8412 private AssetBase FindAssetInUserAssetServer(string id) 8424 private AssetBase FindAssetInUserAssetServer(string id)
8413 { 8425 {
8414 AgentCircuitData aCircuit = ((Scene)Scene).AuthenticateHandler.GetAgentCircuitData(CircuitCode); 8426 AgentCircuitData aCircuit = ((Scene)Scene).AuthenticateHandler.GetAgentCircuitData(CircuitCode);
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 70326b7..32de85f 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -677,6 +677,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
677 public event RequestAvatarProperties OnRequestAvatarProperties; 677 public event RequestAvatarProperties OnRequestAvatarProperties;
678 public event SetAlwaysRun OnSetAlwaysRun; 678 public event SetAlwaysRun OnSetAlwaysRun;
679 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 679 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
680 public event TeleportCancel OnTeleportCancel;
680 public event DeRezObject OnDeRezObject; 681 public event DeRezObject OnDeRezObject;
681 public event Action<IClientAPI> OnRegionHandShakeReply; 682 public event Action<IClientAPI> OnRegionHandShakeReply;
682 public event GenericCall1 OnRequestWearables; 683 public event GenericCall1 OnRequestWearables;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index ed60976..84055cc 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -184,6 +184,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
184 public event RequestMapName OnMapNameRequest; 184 public event RequestMapName OnMapNameRequest;
185 public event TeleportLocationRequest OnTeleportLocationRequest; 185 public event TeleportLocationRequest OnTeleportLocationRequest;
186 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 186 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
187 public event TeleportCancel OnTeleportCancel;
187 public event DisconnectUser OnDisconnectUser; 188 public event DisconnectUser OnDisconnectUser;
188 public event RequestAvatarProperties OnRequestAvatarProperties; 189 public event RequestAvatarProperties OnRequestAvatarProperties;
189 public event SetAlwaysRun OnSetAlwaysRun; 190 public event SetAlwaysRun OnSetAlwaysRun;
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 4e17b04..37b90e1 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -93,6 +93,7 @@ namespace OpenSim.Tests.Common.Mock
93 public event RequestMapName OnMapNameRequest; 93 public event RequestMapName OnMapNameRequest;
94 public event TeleportLocationRequest OnTeleportLocationRequest; 94 public event TeleportLocationRequest OnTeleportLocationRequest;
95 public event TeleportLandmarkRequest OnTeleportLandmarkRequest; 95 public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
96 public event TeleportCancel OnTeleportCancel;
96 public event DisconnectUser OnDisconnectUser; 97 public event DisconnectUser OnDisconnectUser;
97 public event RequestAvatarProperties OnRequestAvatarProperties; 98 public event RequestAvatarProperties OnRequestAvatarProperties;
98 public event SetAlwaysRun OnSetAlwaysRun; 99 public event SetAlwaysRun OnSetAlwaysRun;