diff options
author | Melanie Thielker | 2009-03-30 11:51:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-03-30 11:51:34 +0000 |
commit | f88d755f9679b7b8e1880c76a452bc7344f9cb30 (patch) | |
tree | 08d0ba20919a613a209384bfe3419113e3409776 | |
parent | Thank you Flyte Xevious for Mantis #3361 - Implementation of llEdgeOfWorld (diff) | |
download | opensim-SC-f88d755f9679b7b8e1880c76a452bc7344f9cb30.zip opensim-SC-f88d755f9679b7b8e1880c76a452bc7344f9cb30.tar.gz opensim-SC-f88d755f9679b7b8e1880c76a452bc7344f9cb30.tar.bz2 opensim-SC-f88d755f9679b7b8e1880c76a452bc7344f9cb30.tar.xz |
Add PickInfoReply packet.
Fixes Mantis #3324
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 25 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 3 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 4 |
6 files changed, 41 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 3479806..91661ee 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -1600,5 +1600,9 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1600 | public void SendMuteListUpdate(string filename) | 1600 | public void SendMuteListUpdate(string filename) |
1601 | { | 1601 | { |
1602 | } | 1602 | } |
1603 | |||
1604 | public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) | ||
1605 | { | ||
1606 | } | ||
1603 | } | 1607 | } |
1604 | } | 1608 | } |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 350134c..8d6ca7d 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1122,6 +1122,8 @@ namespace OpenSim.Framework | |||
1122 | void SendAgentDropGroup(UUID groupID); | 1122 | void SendAgentDropGroup(UUID groupID); |
1123 | void SendAvatarNotesReply(UUID targetID, string text); | 1123 | void SendAvatarNotesReply(UUID targetID, string text); |
1124 | void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks); | 1124 | void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks); |
1125 | void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled); | ||
1126 | |||
1125 | void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds); | 1127 | void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds); |
1126 | 1128 | ||
1127 | void SendParcelDwellReply(int localID, UUID parcelID, float dwell); | 1129 | void SendParcelDwellReply(int localID, UUID parcelID, float dwell); |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ab643ae..62918a7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -8701,6 +8701,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8701 | OutPacket(muteListUpdate, ThrottleOutPacketType.Task); | 8701 | OutPacket(muteListUpdate, ThrottleOutPacketType.Task); |
8702 | } | 8702 | } |
8703 | 8703 | ||
8704 | public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) | ||
8705 | { | ||
8706 | PickInfoReplyPacket pickInfoReply = (PickInfoReplyPacket)PacketPool.Instance.GetPacket(PacketType.PickInfoReply); | ||
8707 | |||
8708 | pickInfoReply.AgentData = new PickInfoReplyPacket.AgentDataBlock(); | ||
8709 | pickInfoReply.AgentData.AgentID = AgentId; | ||
8710 | |||
8711 | pickInfoReply.Data = new PickInfoReplyPacket.DataBlock(); | ||
8712 | pickInfoReply.Data.PickID = pickID; | ||
8713 | pickInfoReply.Data.CreatorID = creatorID; | ||
8714 | pickInfoReply.Data.TopPick = topPick; | ||
8715 | pickInfoReply.Data.ParcelID = parcelID; | ||
8716 | pickInfoReply.Data.Name = Utils.StringToBytes(name); | ||
8717 | pickInfoReply.Data.Desc = Utils.StringToBytes(desc); | ||
8718 | pickInfoReply.Data.SnapshotID = snapshotID; | ||
8719 | pickInfoReply.Data.User = Utils.StringToBytes(user); | ||
8720 | pickInfoReply.Data.OriginalName = Utils.StringToBytes(originalName); | ||
8721 | pickInfoReply.Data.SimName = Utils.StringToBytes(simName); | ||
8722 | pickInfoReply.Data.PosGlobal = new Vector3d(posGlobal); | ||
8723 | pickInfoReply.Data.SortOrder = sortOrder; | ||
8724 | pickInfoReply.Data.Enabled = enabled; | ||
8725 | |||
8726 | OutPacket(pickInfoReply, ThrottleOutPacketType.Task); | ||
8727 | } | ||
8728 | |||
8704 | public string Report() | 8729 | public string Report() |
8705 | { | 8730 | { |
8706 | LLPacketHandler handler = (LLPacketHandler) m_PacketHandler; | 8731 | LLPacketHandler handler = (LLPacketHandler) m_PacketHandler; |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 82d0198..5bd9412 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -1067,6 +1067,9 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
1067 | { | 1067 | { |
1068 | } | 1068 | } |
1069 | 1069 | ||
1070 | public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) | ||
1071 | { | ||
1072 | } | ||
1070 | #endregion | 1073 | #endregion |
1071 | } | 1074 | } |
1072 | } | 1075 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index a2ca008..0b0c55d 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -1067,6 +1067,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
1067 | { | 1067 | { |
1068 | } | 1068 | } |
1069 | 1069 | ||
1070 | public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) | ||
1071 | { | ||
1072 | } | ||
1070 | #endregion | 1073 | #endregion |
1071 | } | 1074 | } |
1072 | } | 1075 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 780fa4e..b47e48d 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -1108,5 +1108,9 @@ namespace OpenSim.Tests.Common.Mock | |||
1108 | public void SendMuteListUpdate(string filename) | 1108 | public void SendMuteListUpdate(string filename) |
1109 | { | 1109 | { |
1110 | } | 1110 | } |
1111 | |||
1112 | public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) | ||
1113 | { | ||
1114 | } | ||
1111 | } | 1115 | } |
1112 | } | 1116 | } |