From 793813a6a69854c26ec5c64c6625db98c756a1cd Mon Sep 17 00:00:00 2001 From: Dalien Talbot Date: Sun, 18 Nov 2007 04:00:04 +0000 Subject: [PATCH] Added handler for MapNameRequest - OnMapNameRequest --- OpenSim/Framework/IClientAPI.cs | 3 +++ OpenSim/Region/ClientStack/ClientView.API.cs | 1 + OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 9 +++++++++ OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 1 + 4 files changed, 14 insertions(+) diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index e482cca9dc..ada5ff0477 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -180,6 +180,8 @@ namespace OpenSim.Framework public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY); + public delegate void RequestMapName(IClientAPI remoteClient, string mapName); + public delegate void TeleportLocationRequest( IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags); @@ -297,6 +299,7 @@ namespace OpenSim.Framework event LinkObjects OnLinkObjects; event DelinkObjects OnDelinkObjects; event RequestMapBlocks OnRequestMapBlocks; + event RequestMapName OnMapNameRequest; event TeleportLocationRequest OnTeleportLocationRequest; event DisconnectUser OnDisconnectUser; event RequestAvatarProperties OnRequestAvatarProperties; diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 6f15c44ef1..65d57ad445 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs @@ -84,6 +84,7 @@ namespace OpenSim.Region.ClientStack public event GenericCall2 OnStopMovement; public event Action OnRemoveAvatar; public event RequestMapBlocks OnRequestMapBlocks; + public event RequestMapName OnMapNameRequest; public event TeleportLocationRequest OnTeleportLocationRequest; public event DisconnectUser OnDisconnectUser; public event RequestAvatarProperties OnRequestAvatarProperties; diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 0161928e69..4336eb4107 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs @@ -611,6 +611,15 @@ namespace OpenSim.Region.ClientStack MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY); } break; + case PacketType.MapNameRequest: + MapNameRequestPacket map = (MapNameRequestPacket) Pack; + string mapName = UTF8Encoding.UTF8.GetString(map.NameData.Name, 0, + map.NameData.Name.Length - 1); + if (OnMapNameRequest != null) + { + OnMapNameRequest(this, mapName); + } + break; case PacketType.TeleportLandmarkRequest: TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket) Pack; diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index d107aab074..e084266971 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs @@ -59,6 +59,7 @@ namespace SimpleApp public event LinkObjects OnLinkObjects; public event DelinkObjects OnDelinkObjects; public event RequestMapBlocks OnRequestMapBlocks; + public event RequestMapName OnMapNameRequest; public event TeleportLocationRequest OnTeleportLocationRequest; public event DisconnectUser OnDisconnectUser; public event RequestAvatarProperties OnRequestAvatarProperties;