aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs36
1 files changed, 34 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 0b8b95b..d2d1e8f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -154,6 +154,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
154 public event RequestTaskInventory OnRequestTaskInventory; 154 public event RequestTaskInventory OnRequestTaskInventory;
155 public event UpdateInventoryItem OnUpdateInventoryItem; 155 public event UpdateInventoryItem OnUpdateInventoryItem;
156 public event CopyInventoryItem OnCopyInventoryItem; 156 public event CopyInventoryItem OnCopyInventoryItem;
157 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
157 public event MoveInventoryItem OnMoveInventoryItem; 158 public event MoveInventoryItem OnMoveInventoryItem;
158 public event RemoveInventoryItem OnRemoveInventoryItem; 159 public event RemoveInventoryItem OnRemoveInventoryItem;
159 public event RemoveInventoryFolder OnRemoveInventoryFolder; 160 public event RemoveInventoryFolder OnRemoveInventoryFolder;
@@ -4327,8 +4328,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4327 4328
4328 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount) 4329 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount)
4329 { 4330 {
4330
4331
4332 int notifyCount = ownersAndCount.Count; 4331 int notifyCount = ownersAndCount.Count;
4333 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply); 4332 ParcelObjectOwnersReplyPacket pack = (ParcelObjectOwnersReplyPacket)PacketPool.Instance.GetPacket(PacketType.ParcelObjectOwnersReply);
4334 4333
@@ -4600,6 +4599,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4600 update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes; 4599 update.TextureEntry = data.Shape.TextureEntry ?? Utils.EmptyBytes;
4601 update.Scale = data.Shape.Scale; 4600 update.Scale = data.Shape.Scale;
4602 update.Text = Util.StringToBytes256(data.Text); 4601 update.Text = Util.StringToBytes256(data.Text);
4602 update.MediaURL = Util.StringToBytes256(data.MediaUrl);
4603 4603
4604 #region PrimFlags 4604 #region PrimFlags
4605 4605
@@ -4840,6 +4840,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4840 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false); 4840 AddLocalPacketHandler(PacketType.TransferAbort, HandleTransferAbort, false);
4841 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false); 4841 AddLocalPacketHandler(PacketType.MuteListRequest, HandleMuteListRequest, false);
4842 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode); 4842 AddLocalPacketHandler(PacketType.UseCircuitCode, HandleUseCircuitCode);
4843 AddLocalPacketHandler(PacketType.CreateNewOutfitAttachments, HandleCreateNewOutfitAttachments);
4843 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false); 4844 AddLocalPacketHandler(PacketType.AgentHeightWidth, HandleAgentHeightWidth, false);
4844 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents); 4845 AddLocalPacketHandler(PacketType.InventoryDescendents, HandleInventoryDescendents);
4845 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery); 4846 AddLocalPacketHandler(PacketType.DirPlacesQuery, HandleDirPlacesQuery);
@@ -9349,6 +9350,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9349 { 9350 {
9350 return true; 9351 return true;
9351 } 9352 }
9353
9354 private bool HandleCreateNewOutfitAttachments(IClientAPI sender, Packet Pack)
9355 {
9356 CreateNewOutfitAttachmentsPacket packet = (CreateNewOutfitAttachmentsPacket)Pack;
9357
9358 #region Packet Session and User Check
9359 if (m_checkPackets)
9360 {
9361 if (packet.AgentData.SessionID != SessionId ||
9362 packet.AgentData.AgentID != AgentId)
9363 return true;
9364 }
9365 #endregion
9366 MoveItemsAndLeaveCopy handlerMoveItemsAndLeaveCopy = null;
9367 List<InventoryItemBase> items = new List<InventoryItemBase>();
9368 foreach (CreateNewOutfitAttachmentsPacket.ObjectDataBlock n in packet.ObjectData)
9369 {
9370 InventoryItemBase b = new InventoryItemBase();
9371 b.ID = n.OldItemID;
9372 b.Folder = n.OldFolderID;
9373 items.Add(b);
9374 }
9375
9376 handlerMoveItemsAndLeaveCopy = OnMoveItemsAndLeaveCopy;
9377 if (handlerMoveItemsAndLeaveCopy != null)
9378 {
9379 handlerMoveItemsAndLeaveCopy(this, items, packet.HeaderData.NewFolderID);
9380 }
9381
9382 return true;
9383 }
9352 9384
9353 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack) 9385 private bool HandleAgentHeightWidth(IClientAPI sender, Packet Pack)
9354 { 9386 {