diff options
author | Melanie | 2011-12-04 12:35:01 +0100 |
---|---|---|
committer | Melanie | 2011-12-04 12:35:01 +0100 |
commit | ec8c93aa5e1d0af2c0adf38156b05e85421f4a81 (patch) | |
tree | 95c3431fae78fede98f6571704ccbd5ff7bf1c4c | |
parent | Remove some debug code that had snuck in (diff) | |
download | opensim-SC-ec8c93aa5e1d0af2c0adf38156b05e85421f4a81.zip opensim-SC-ec8c93aa5e1d0af2c0adf38156b05e85421f4a81.tar.gz opensim-SC-ec8c93aa5e1d0af2c0adf38156b05e85421f4a81.tar.bz2 opensim-SC-ec8c93aa5e1d0af2c0adf38156b05e85421f4a81.tar.xz |
Implement ChangeInventoryItemFlagsPacket handling
5 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 925998f..cda8a1b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -503,6 +503,7 @@ namespace OpenSim.Framework | |||
503 | public delegate void SimWideDeletesDelegate(IClientAPI client,UUID agentID, int flags, UUID targetID); | 503 | public delegate void SimWideDeletesDelegate(IClientAPI client,UUID agentID, int flags, UUID targetID); |
504 | 504 | ||
505 | public delegate void SendPostcard(IClientAPI client); | 505 | public delegate void SendPostcard(IClientAPI client); |
506 | public delegate void ChangeInventoryItemFlags(IClientAPI client, UUID itemID, uint flags); | ||
506 | 507 | ||
507 | #endregion | 508 | #endregion |
508 | 509 | ||
@@ -1007,6 +1008,7 @@ namespace OpenSim.Framework | |||
1007 | event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 1008 | event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
1008 | event SimWideDeletesDelegate OnSimWideDeletes; | 1009 | event SimWideDeletesDelegate OnSimWideDeletes; |
1009 | event SendPostcard OnSendPostcard; | 1010 | event SendPostcard OnSendPostcard; |
1011 | event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
1010 | event MuteListEntryUpdate OnUpdateMuteListEntry; | 1012 | event MuteListEntryUpdate OnUpdateMuteListEntry; |
1011 | event MuteListEntryRemove OnRemoveMuteListEntry; | 1013 | event MuteListEntryRemove OnRemoveMuteListEntry; |
1012 | event GodlikeMessage onGodlikeMessage; | 1014 | event GodlikeMessage onGodlikeMessage; |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 3186dff..effa8d0 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -286,6 +286,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
286 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 286 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
287 | public event SimWideDeletesDelegate OnSimWideDeletes; | 287 | public event SimWideDeletesDelegate OnSimWideDeletes; |
288 | public event SendPostcard OnSendPostcard; | 288 | public event SendPostcard OnSendPostcard; |
289 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
289 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 290 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
290 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 291 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
291 | public event GodlikeMessage onGodlikeMessage; | 292 | public event GodlikeMessage onGodlikeMessage; |
@@ -5344,6 +5345,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5344 | AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest); | 5345 | AddLocalPacketHandler(PacketType.GroupVoteHistoryRequest, HandleGroupVoteHistoryRequest); |
5345 | AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes); | 5346 | AddLocalPacketHandler(PacketType.SimWideDeletes, HandleSimWideDeletes); |
5346 | AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard); | 5347 | AddLocalPacketHandler(PacketType.SendPostcard, HandleSendPostcard); |
5348 | AddLocalPacketHandler(PacketType.ChangeInventoryItemFlags, HandleChangeInventoryItemFlags); | ||
5347 | 5349 | ||
5348 | AddGenericPacketHandler("autopilot", HandleAutopilot); | 5350 | AddGenericPacketHandler("autopilot", HandleAutopilot); |
5349 | } | 5351 | } |
@@ -9822,6 +9824,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9822 | return false; | 9824 | return false; |
9823 | } | 9825 | } |
9824 | 9826 | ||
9827 | private bool HandleChangeInventoryItemFlags(IClientAPI client, Packet packet) | ||
9828 | { | ||
9829 | ChangeInventoryItemFlagsPacket ChangeInventoryItemFlags = | ||
9830 | (ChangeInventoryItemFlagsPacket)packet; | ||
9831 | ChangeInventoryItemFlags handlerChangeInventoryItemFlags = OnChangeInventoryItemFlags; | ||
9832 | if (handlerChangeInventoryItemFlags != null) | ||
9833 | { | ||
9834 | foreach(ChangeInventoryItemFlagsPacket.InventoryDataBlock b in ChangeInventoryItemFlags.InventoryData) | ||
9835 | handlerChangeInventoryItemFlags(this, b.ItemID, b.Flags); | ||
9836 | return true; | ||
9837 | } | ||
9838 | return false; | ||
9839 | } | ||
9840 | |||
9825 | private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) | 9841 | private bool HandleUseCircuitCode(IClientAPI sender, Packet Pack) |
9826 | { | 9842 | { |
9827 | return true; | 9843 | return true; |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 9fa243e..60d3c2d 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -860,6 +860,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
860 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 860 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
861 | public event SimWideDeletesDelegate OnSimWideDeletes; | 861 | public event SimWideDeletesDelegate OnSimWideDeletes; |
862 | public event SendPostcard OnSendPostcard; | 862 | public event SendPostcard OnSendPostcard; |
863 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
863 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 864 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
864 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 865 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
865 | public event GodlikeMessage onGodlikeMessage; | 866 | public event GodlikeMessage onGodlikeMessage; |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index a29ed21..2b60cc3 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -400,6 +400,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
400 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 400 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
401 | public event SimWideDeletesDelegate OnSimWideDeletes; | 401 | public event SimWideDeletesDelegate OnSimWideDeletes; |
402 | public event SendPostcard OnSendPostcard; | 402 | public event SendPostcard OnSendPostcard; |
403 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
403 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 404 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
404 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 405 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
405 | public event GodlikeMessage onGodlikeMessage; | 406 | public event GodlikeMessage onGodlikeMessage; |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index cedd6c7..1e74451 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -312,6 +312,7 @@ namespace OpenSim.Tests.Common.Mock | |||
312 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; | 312 | public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; |
313 | public event SimWideDeletesDelegate OnSimWideDeletes; | 313 | public event SimWideDeletesDelegate OnSimWideDeletes; |
314 | public event SendPostcard OnSendPostcard; | 314 | public event SendPostcard OnSendPostcard; |
315 | public event ChangeInventoryItemFlags OnChangeInventoryItemFlags; | ||
315 | public event MuteListEntryUpdate OnUpdateMuteListEntry; | 316 | public event MuteListEntryUpdate OnUpdateMuteListEntry; |
316 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 317 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
317 | public event GodlikeMessage onGodlikeMessage; | 318 | public event GodlikeMessage onGodlikeMessage; |