Merge branch 'master' into careminster
commit
6b080d57cb
|
@ -84,6 +84,8 @@ namespace OpenSim.Framework
|
|||
public delegate void TeleportLandmarkRequest(
|
||||
IClientAPI remoteClient, AssetLandmark lm);
|
||||
|
||||
public delegate void TeleportCancel(IClientAPI remoteClient);
|
||||
|
||||
public delegate void DisconnectUser();
|
||||
|
||||
public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID);
|
||||
|
@ -793,6 +795,7 @@ namespace OpenSim.Framework
|
|||
event RequestAvatarProperties OnRequestAvatarProperties;
|
||||
event SetAlwaysRun OnSetAlwaysRun;
|
||||
event TeleportLandmarkRequest OnTeleportLandmarkRequest;
|
||||
event TeleportCancel OnTeleportCancel;
|
||||
event DeRezObject OnDeRezObject;
|
||||
event Action<IClientAPI> OnRegionHandShakeReply;
|
||||
event GenericCall1 OnRequestWearables;
|
||||
|
|
|
@ -140,6 +140,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
public event RequestMapName OnMapNameRequest;
|
||||
public event TeleportLocationRequest OnTeleportLocationRequest;
|
||||
public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
|
||||
public event TeleportCancel OnTeleportCancel;
|
||||
public event DisconnectUser OnDisconnectUser;
|
||||
public event RequestAvatarProperties OnRequestAvatarProperties;
|
||||
public event SetAlwaysRun OnSetAlwaysRun;
|
||||
|
@ -5231,6 +5232,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
AddLocalPacketHandler(PacketType.MapBlockRequest, HandleMapBlockRequest, false);
|
||||
AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest, false);
|
||||
AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest);
|
||||
AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel);
|
||||
AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest);
|
||||
AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false);
|
||||
AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest);
|
||||
|
@ -8470,6 +8472,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
return true;
|
||||
}
|
||||
|
||||
private bool HandleTeleportCancel(IClientAPI sender, Packet Pack)
|
||||
{
|
||||
TeleportCancel handlerTeleportCancel = OnTeleportCancel;
|
||||
if (handlerTeleportCancel != null)
|
||||
{
|
||||
handlerTeleportCancel(this);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private AssetBase FindAssetInUserAssetServer(string id)
|
||||
{
|
||||
AgentCircuitData aCircuit = ((Scene)Scene).AuthenticateHandler.GetAgentCircuitData(CircuitCode);
|
||||
|
|
|
@ -677,6 +677,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
|
|||
public event RequestAvatarProperties OnRequestAvatarProperties;
|
||||
public event SetAlwaysRun OnSetAlwaysRun;
|
||||
public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
|
||||
public event TeleportCancel OnTeleportCancel;
|
||||
public event DeRezObject OnDeRezObject;
|
||||
public event Action<IClientAPI> OnRegionHandShakeReply;
|
||||
public event GenericCall1 OnRequestWearables;
|
||||
|
|
|
@ -184,6 +184,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
|
|||
public event RequestMapName OnMapNameRequest;
|
||||
public event TeleportLocationRequest OnTeleportLocationRequest;
|
||||
public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
|
||||
public event TeleportCancel OnTeleportCancel;
|
||||
public event DisconnectUser OnDisconnectUser;
|
||||
public event RequestAvatarProperties OnRequestAvatarProperties;
|
||||
public event SetAlwaysRun OnSetAlwaysRun;
|
||||
|
|
|
@ -93,6 +93,7 @@ namespace OpenSim.Tests.Common.Mock
|
|||
public event RequestMapName OnMapNameRequest;
|
||||
public event TeleportLocationRequest OnTeleportLocationRequest;
|
||||
public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
|
||||
public event TeleportCancel OnTeleportCancel;
|
||||
public event DisconnectUser OnDisconnectUser;
|
||||
public event RequestAvatarProperties OnRequestAvatarProperties;
|
||||
public event SetAlwaysRun OnSetAlwaysRun;
|
||||
|
|
Loading…
Reference in New Issue