diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index 267e7ee..1613aa1 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -387,11 +387,9 @@ namespace OpenSim.Region.ClientStack | |||
387 | { | 387 | { |
388 | CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; | 388 | CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; |
389 | this.OnCreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); | 389 | this.OnCreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); |
390 | //m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID); | ||
391 | } | 390 | } |
392 | break; | 391 | break; |
393 | case PacketType.CreateInventoryItem: | 392 | case PacketType.CreateInventoryItem: |
394 | //Console.WriteLine(Pack.ToString()); | ||
395 | CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; | 393 | CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; |
396 | if (createItem.InventoryBlock.TransactionID != LLUUID.Zero) | 394 | if (createItem.InventoryBlock.TransactionID != LLUUID.Zero) |
397 | { | 395 | { |
@@ -399,20 +397,28 @@ namespace OpenSim.Region.ClientStack | |||
399 | } | 397 | } |
400 | else | 398 | else |
401 | { | 399 | { |
402 | // Console.Write(Pack.ToString()); | 400 | if (this.OnCreateNewInventoryItem != null) |
403 | this.CreateInventoryItem(createItem); | 401 | { |
402 | this.OnCreateNewInventoryItem(this, createItem.InventoryBlock.TransactionID, createItem.InventoryBlock.FolderID, createItem.InventoryBlock.CallbackID, | ||
403 | Util.FieldToString(createItem.InventoryBlock.Description), Util.FieldToString(createItem.InventoryBlock.Name), createItem.InventoryBlock.InvType, | ||
404 | createItem.InventoryBlock.Type, createItem.InventoryBlock.WearableType, createItem.InventoryBlock.NextOwnerMask); | ||
405 | } | ||
404 | } | 406 | } |
405 | break; | 407 | break; |
406 | case PacketType.FetchInventory: | 408 | case PacketType.FetchInventory: |
407 | //Console.WriteLine("fetch item packet"); | 409 | if (this.OnFetchInventory != null) |
408 | FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack; | 410 | { |
409 | m_inventoryCache.FetchInventory(this, FetchInventory); | 411 | FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack; |
412 | for (int i = 0; i < FetchInventory.InventoryData.Length; i++) | ||
413 | { | ||
414 | this.OnFetchInventory(this, FetchInventory.InventoryData[i].ItemID, FetchInventory.InventoryData[i].OwnerID); | ||
415 | } | ||
416 | } | ||
410 | break; | 417 | break; |
411 | case PacketType.FetchInventoryDescendents: | 418 | case PacketType.FetchInventoryDescendents: |
412 | if (this.OnFetchInventoryDescendents != null) | 419 | if (this.OnFetchInventoryDescendents != null) |
413 | { | 420 | { |
414 | FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; | 421 | FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; |
415 | // m_inventoryCache.FetchInventoryDescendents(this, Fetch); | ||
416 | this.OnFetchInventoryDescendents(this, Fetch.InventoryData.FolderID, Fetch.InventoryData.OwnerID, Fetch.InventoryData.FetchFolders, Fetch.InventoryData.FetchItems, Fetch.InventoryData.SortOrder); | 422 | this.OnFetchInventoryDescendents(this, Fetch.InventoryData.FolderID, Fetch.InventoryData.OwnerID, Fetch.InventoryData.FetchFolders, Fetch.InventoryData.FetchItems, Fetch.InventoryData.SortOrder); |
417 | } | 423 | } |
418 | break; | 424 | break; |
@@ -450,7 +456,6 @@ namespace OpenSim.Region.ClientStack | |||
450 | } | 456 | } |
451 | break; | 457 | break; |
452 | case PacketType.RequestTaskInventory: | 458 | case PacketType.RequestTaskInventory: |
453 | // Console.WriteLine(Pack.ToString()); | ||
454 | RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; | 459 | RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; |
455 | if (this.OnRequestTaskInventory != null) | 460 | if (this.OnRequestTaskInventory != null) |
456 | { | 461 | { |