aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
-rw-r--r--OpenSim/Region/ClientStack/ClientView.API.cs1
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs9
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs1
4 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index e482cca..ada5ff0 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -180,6 +180,8 @@ namespace OpenSim.Framework
180 180
181 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY); 181 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
182 182
183 public delegate void RequestMapName(IClientAPI remoteClient, string mapName);
184
183 public delegate void TeleportLocationRequest( 185 public delegate void TeleportLocationRequest(
184 IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags); 186 IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
185 187
@@ -297,6 +299,7 @@ namespace OpenSim.Framework
297 event LinkObjects OnLinkObjects; 299 event LinkObjects OnLinkObjects;
298 event DelinkObjects OnDelinkObjects; 300 event DelinkObjects OnDelinkObjects;
299 event RequestMapBlocks OnRequestMapBlocks; 301 event RequestMapBlocks OnRequestMapBlocks;
302 event RequestMapName OnMapNameRequest;
300 event TeleportLocationRequest OnTeleportLocationRequest; 303 event TeleportLocationRequest OnTeleportLocationRequest;
301 event DisconnectUser OnDisconnectUser; 304 event DisconnectUser OnDisconnectUser;
302 event RequestAvatarProperties OnRequestAvatarProperties; 305 event RequestAvatarProperties OnRequestAvatarProperties;
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 6f15c44..65d57ad 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Region.ClientStack
84 public event GenericCall2 OnStopMovement; 84 public event GenericCall2 OnStopMovement;
85 public event Action<LLUUID> OnRemoveAvatar; 85 public event Action<LLUUID> OnRemoveAvatar;
86 public event RequestMapBlocks OnRequestMapBlocks; 86 public event RequestMapBlocks OnRequestMapBlocks;
87 public event RequestMapName OnMapNameRequest;
87 public event TeleportLocationRequest OnTeleportLocationRequest; 88 public event TeleportLocationRequest OnTeleportLocationRequest;
88 public event DisconnectUser OnDisconnectUser; 89 public event DisconnectUser OnDisconnectUser;
89 public event RequestAvatarProperties OnRequestAvatarProperties; 90 public event RequestAvatarProperties OnRequestAvatarProperties;
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 0161928..4336eb4 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -611,6 +611,15 @@ namespace OpenSim.Region.ClientStack
611 MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY); 611 MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
612 } 612 }
613 break; 613 break;
614 case PacketType.MapNameRequest:
615 MapNameRequestPacket map = (MapNameRequestPacket) Pack;
616 string mapName = UTF8Encoding.UTF8.GetString(map.NameData.Name, 0,
617 map.NameData.Name.Length - 1);
618 if (OnMapNameRequest != null)
619 {
620 OnMapNameRequest(this, mapName);
621 }
622 break;
614 case PacketType.TeleportLandmarkRequest: 623 case PacketType.TeleportLandmarkRequest:
615 TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket) Pack; 624 TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket) Pack;
616 625
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index d107aab..e084266 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -59,6 +59,7 @@ namespace SimpleApp
59 public event LinkObjects OnLinkObjects; 59 public event LinkObjects OnLinkObjects;
60 public event DelinkObjects OnDelinkObjects; 60 public event DelinkObjects OnDelinkObjects;
61 public event RequestMapBlocks OnRequestMapBlocks; 61 public event RequestMapBlocks OnRequestMapBlocks;
62 public event RequestMapName OnMapNameRequest;
62 public event TeleportLocationRequest OnTeleportLocationRequest; 63 public event TeleportLocationRequest OnTeleportLocationRequest;
63 public event DisconnectUser OnDisconnectUser; 64 public event DisconnectUser OnDisconnectUser;
64 public event RequestAvatarProperties OnRequestAvatarProperties; 65 public event RequestAvatarProperties OnRequestAvatarProperties;