diff options
author | Melanie Thielker | 2008-12-25 20:28:13 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-12-25 20:28:13 +0000 |
commit | 23844a9073e28fb8c74424812603027586bdb4df (patch) | |
tree | 3267ff93ec895d352990ea6f783f1b4a62645670 | |
parent | Plumb yet another groups packet (diff) | |
download | opensim-SC_OLD-23844a9073e28fb8c74424812603027586bdb4df.zip opensim-SC_OLD-23844a9073e28fb8c74424812603027586bdb4df.tar.gz opensim-SC_OLD-23844a9073e28fb8c74424812603027586bdb4df.tar.bz2 opensim-SC_OLD-23844a9073e28fb8c74424812603027586bdb4df.tar.xz |
Plumb the profile reply packets for picks, classifieds and notes
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 64 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 17 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestClient.cs | 17 |
5 files changed, 120 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 05e8f75..79311d5 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1077,6 +1077,11 @@ namespace OpenSim.Framework | |||
1077 | void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name); | 1077 | void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name); |
1078 | void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price); | 1078 | void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price); |
1079 | 1079 | ||
1080 | void SendAgentDropGroup(UUID groupID); | ||
1081 | void SendAvatarNotesReply(UUID targetID, string text); | ||
1082 | void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks); | ||
1083 | void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds); | ||
1084 | |||
1080 | void KillEndDone(); | 1085 | void KillEndDone(); |
1081 | 1086 | ||
1082 | bool AddGenericPacketHandler(string MethodName, GenericMessage handler); | 1087 | bool AddGenericPacketHandler(string MethodName, GenericMessage handler); |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index beebfd4..962071b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -8219,6 +8219,70 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8219 | OutPacket(dg, ThrottleOutPacketType.Task); | 8219 | OutPacket(dg, ThrottleOutPacketType.Task); |
8220 | } | 8220 | } |
8221 | 8221 | ||
8222 | public void SendAvatarNotesReply(UUID targetID, string text) | ||
8223 | { | ||
8224 | AvatarNotesReplyPacket an = | ||
8225 | (AvatarNotesReplyPacket)PacketPool.Instance.GetPacket( | ||
8226 | PacketType.AvatarNotesReply); | ||
8227 | |||
8228 | an.AgentData = new AvatarNotesReplyPacket.AgentDataBlock(); | ||
8229 | an.AgentData.AgentID = AgentId; | ||
8230 | |||
8231 | an.Data = new AvatarNotesReplyPacket.DataBlock(); | ||
8232 | an.Data.TargetID = targetID; | ||
8233 | an.Data.Notes = Utils.StringToBytes(text); | ||
8234 | |||
8235 | OutPacket(an, ThrottleOutPacketType.Task); | ||
8236 | } | ||
8237 | |||
8238 | public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks) | ||
8239 | { | ||
8240 | AvatarPicksReplyPacket ap = | ||
8241 | (AvatarPicksReplyPacket)PacketPool.Instance.GetPacket( | ||
8242 | PacketType.AvatarPicksReply); | ||
8243 | |||
8244 | ap.AgentData = new AvatarPicksReplyPacket.AgentDataBlock(); | ||
8245 | ap.AgentData.AgentID = AgentId; | ||
8246 | ap.AgentData.TargetID = targetID; | ||
8247 | |||
8248 | ap.Data = new AvatarPicksReplyPacket.DataBlock[picks.Count]; | ||
8249 | |||
8250 | int i = 0; | ||
8251 | foreach(KeyValuePair<UUID, string> pick in picks) | ||
8252 | { | ||
8253 | ap.Data[i] = new AvatarPicksReplyPacket.DataBlock(); | ||
8254 | ap.Data[i].PickID = pick.Key; | ||
8255 | ap.Data[i].PickName = Utils.StringToBytes(pick.Value); | ||
8256 | i++; | ||
8257 | } | ||
8258 | |||
8259 | OutPacket(ap, ThrottleOutPacketType.Task); | ||
8260 | } | ||
8261 | |||
8262 | public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds) | ||
8263 | { | ||
8264 | AvatarClassifiedReplyPacket ac = | ||
8265 | (AvatarClassifiedReplyPacket)PacketPool.Instance.GetPacket( | ||
8266 | PacketType.AvatarClassifiedReply); | ||
8267 | |||
8268 | ac.AgentData = new AvatarClassifiedReplyPacket.AgentDataBlock(); | ||
8269 | ac.AgentData.AgentID = AgentId; | ||
8270 | ac.AgentData.TargetID = targetID; | ||
8271 | |||
8272 | ac.Data = new AvatarClassifiedReplyPacket.DataBlock[classifieds.Count]; | ||
8273 | |||
8274 | int i = 0; | ||
8275 | foreach(KeyValuePair<UUID, string> classified in classifieds) | ||
8276 | { | ||
8277 | ac.Data[i] = new AvatarClassifiedReplyPacket.DataBlock(); | ||
8278 | ac.Data[i].ClassifiedID = classified.Key; | ||
8279 | ac.Data[i].Name = Utils.StringToBytes(classified.Value); | ||
8280 | i++; | ||
8281 | } | ||
8282 | |||
8283 | OutPacket(ac, ThrottleOutPacketType.Task); | ||
8284 | } | ||
8285 | |||
8222 | public void KillEndDone() | 8286 | public void KillEndDone() |
8223 | { | 8287 | { |
8224 | KillPacket kp = new KillPacket(); | 8288 | 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 95744b5..61b8690 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -1023,6 +1023,23 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
1023 | { | 1023 | { |
1024 | } | 1024 | } |
1025 | 1025 | ||
1026 | public void SendAgentDropGroup(UUID groupID) | ||
1027 | { | ||
1028 | } | ||
1029 | |||
1030 | public void SendAvatarNotesReply(UUID targetID, string text) | ||
1031 | { | ||
1032 | } | ||
1033 | |||
1034 | public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks) | ||
1035 | { | ||
1036 | } | ||
1037 | |||
1038 | public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds) | ||
1039 | { | ||
1040 | } | ||
1041 | |||
1042 | |||
1026 | #endregion | 1043 | #endregion |
1027 | } | 1044 | } |
1028 | } | 1045 | } |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index fd5fa7a..79e6653 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -1024,6 +1024,23 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
1024 | { | 1024 | { |
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | public void SendAgentDropGroup(UUID groupID) | ||
1028 | { | ||
1029 | } | ||
1030 | |||
1031 | public void SendAvatarNotesReply(UUID targetID, string text) | ||
1032 | { | ||
1033 | } | ||
1034 | |||
1035 | public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks) | ||
1036 | { | ||
1037 | } | ||
1038 | |||
1039 | public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds) | ||
1040 | { | ||
1041 | } | ||
1042 | |||
1043 | |||
1027 | #endregion | 1044 | #endregion |
1028 | } | 1045 | } |
1029 | } | 1046 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index cb26366..fe93d6b 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -970,5 +970,22 @@ namespace OpenSim.Tests.Common.Mock | |||
970 | { | 970 | { |
971 | } | 971 | } |
972 | 972 | ||
973 | public void SendAgentDropGroup(UUID groupID) | ||
974 | { | ||
975 | } | ||
976 | |||
977 | public void SendAvatarNotesReply(UUID targetID, string text) | ||
978 | { | ||
979 | } | ||
980 | |||
981 | public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks) | ||
982 | { | ||
983 | } | ||
984 | |||
985 | public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds) | ||
986 | { | ||
987 | } | ||
988 | |||
989 | |||
973 | } | 990 | } |
974 | } | 991 | } |