diff options
author | Melanie Thielker | 2008-10-05 02:25:53 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-05 02:25:53 +0000 |
commit | 13e3ffada36529bd64909d272b4e25145c26e4c8 (patch) | |
tree | 4313bbf0086f150b747b3492b198a29672b7b3e0 /OpenSim | |
parent | Fix Mantis #2281: touch events in non-default states in DNE work again. (diff) | |
download | opensim-SC_OLD-13e3ffada36529bd64909d272b4e25145c26e4c8.zip opensim-SC_OLD-13e3ffada36529bd64909d272b4e25145c26e4c8.tar.gz opensim-SC_OLD-13e3ffada36529bd64909d272b4e25145c26e4c8.tar.bz2 opensim-SC_OLD-13e3ffada36529bd64909d272b4e25145c26e4c8.tar.xz |
Plumb in the DirPlacesReply packet
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 11 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 31 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 4 |
4 files changed, 50 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 2ae66e4..c0d133e 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -312,6 +312,15 @@ namespace OpenSim.Framework | |||
312 | public delegate void DirPlacesQuery(IClientAPI remoteClient, UUID queryID, string queryText, int queryFlags, int category, string simName, int queryStart); | 312 | public delegate void DirPlacesQuery(IClientAPI remoteClient, UUID queryID, string queryText, int queryFlags, int category, string simName, int queryStart); |
313 | #endregion | 313 | #endregion |
314 | 314 | ||
315 | public struct DirPlacesReplyData | ||
316 | { | ||
317 | public UUID parcelID; | ||
318 | public string name; | ||
319 | public bool forSale; | ||
320 | public bool auction; | ||
321 | public float dwell; | ||
322 | } | ||
323 | |||
315 | public interface IClientAPI | 324 | public interface IClientAPI |
316 | { | 325 | { |
317 | Vector3 StartPos { get; set; } | 326 | Vector3 StartPos { get; set; } |
@@ -764,6 +773,8 @@ namespace OpenSim.Framework | |||
764 | void SendRegionHandle(UUID regoinID, ulong handle); | 773 | void SendRegionHandle(UUID regoinID, ulong handle); |
765 | void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y); | 774 | void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y); |
766 | void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt); | 775 | void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt); |
776 | |||
777 | void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data); | ||
767 | void KillEndDone(); | 778 | void KillEndDone(); |
768 | } | 779 | } |
769 | } | 780 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 5d7a1ca..2cb33d0 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -6725,6 +6725,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6725 | return string.Empty; | 6725 | return string.Empty; |
6726 | } | 6726 | } |
6727 | 6727 | ||
6728 | public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data) | ||
6729 | { | ||
6730 | DirPlacesReplyPacket packet = (DirPlacesReplyPacket)PacketPool.Instance.GetPacket(PacketType.DirPlacesReply); | ||
6731 | |||
6732 | packet.AgentData = new DirPlacesReplyPacket.AgentDataBlock(); | ||
6733 | |||
6734 | packet.QueryData = new DirPlacesReplyPacket.QueryDataBlock[1]; | ||
6735 | packet.QueryData[0] = new DirPlacesReplyPacket.QueryDataBlock(); | ||
6736 | |||
6737 | packet.QueryReplies = | ||
6738 | new DirPlacesReplyPacket.QueryRepliesBlock[data.Length]; | ||
6739 | |||
6740 | packet.AgentData.AgentID = AgentId; | ||
6741 | |||
6742 | packet.QueryData[0].QueryID = queryID; | ||
6743 | |||
6744 | int i = 0; | ||
6745 | foreach (DirPlacesReplyData d in data) | ||
6746 | { | ||
6747 | packet.QueryReplies[i] = | ||
6748 | new DirPlacesReplyPacket.QueryRepliesBlock(); | ||
6749 | packet.QueryReplies[i].ParcelID = d.parcelID; | ||
6750 | packet.QueryReplies[i].Name = Utils.StringToBytes(d.name); | ||
6751 | packet.QueryReplies[i].ForSale = d.forSale; | ||
6752 | packet.QueryReplies[i].Auction = d.auction; | ||
6753 | packet.QueryReplies[i].Dwell = d.dwell; | ||
6754 | } | ||
6755 | |||
6756 | OutPacket(packet, ThrottleOutPacketType.Task); | ||
6757 | } | ||
6758 | |||
6728 | public void KillEndDone() | 6759 | public void KillEndDone() |
6729 | { | 6760 | { |
6730 | KillPacket kp = new KillPacket(); | 6761 | KillPacket kp = new KillPacket(); |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index c190434..99c953c 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -891,6 +891,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
891 | { | 891 | { |
892 | } | 892 | } |
893 | 893 | ||
894 | public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data) | ||
895 | { | ||
896 | } | ||
897 | |||
894 | public void KillEndDone() | 898 | public void KillEndDone() |
895 | { | 899 | { |
896 | } | 900 | } |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 1566b2e..6fbab0a 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -888,6 +888,10 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
888 | { | 888 | { |
889 | } | 889 | } |
890 | 890 | ||
891 | public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data) | ||
892 | { | ||
893 | } | ||
894 | |||
891 | public void KillEndDone() | 895 | public void KillEndDone() |
892 | { | 896 | { |
893 | } | 897 | } |