aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs84
1 files changed, 42 insertions, 42 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 25fbbd8..4e29174 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -171,16 +171,16 @@ namespace OpenSim.Region.ClientStack
171 private RequestXfer handler047 = null; //OnRequestXfer; 171 private RequestXfer handler047 = null; //OnRequestXfer;
172 private XferReceive handler048 = null; //OnXferReceive; 172 private XferReceive handler048 = null; //OnXferReceive;
173 private ConfirmXfer handler049 = null; //OnConfirmXfer; 173 private ConfirmXfer handler049 = null; //OnConfirmXfer;
174 private CreateInventoryFolder handler050 = null; //OnCreateNewInventoryFolder; 174 private CreateInventoryFolder handlerCreateInventoryFolder = null; //OnCreateNewInventoryFolder;
175 private UpdateInventoryFolder handler051 = null; 175 private UpdateInventoryFolder handlerUpdateInventoryFolder = null;
176 private MoveInventoryFolder handler052 = null; 176 private MoveInventoryFolder handlerMoveInventoryFolder = null;
177 private CreateNewInventoryItem handler053 = null; //OnCreateNewInventoryItem; 177 private CreateNewInventoryItem handlerCreateNewInventoryItem = null; //OnCreateNewInventoryItem;
178 private FetchInventory handler054 = null; 178 private FetchInventory handlerFetchInventory = null;
179 private FetchInventoryDescendents handler055 = null; //OnFetchInventoryDescendents; 179 private FetchInventoryDescendents handlerFetchInventoryDescendents = null; //OnFetchInventoryDescendents;
180 private PurgeInventoryDescendents handler056 = null; //OnPurgeInventoryDescendents; 180 private PurgeInventoryDescendents handlerPurgeInventoryDescendents = null; //OnPurgeInventoryDescendents;
181 private UpdateInventoryItem handler057 = null; 181 private UpdateInventoryItem handlerUpdateInventoryItem = null;
182 private CopyInventoryItem handler058 = null; 182 private CopyInventoryItem handlerCopyInventoryItem = null;
183 private MoveInventoryItem handler059 = null; 183 private MoveInventoryItem handlerMoveInventoryItem = null;
184 private RemoveInventoryItem handlerRemoveInventoryItem = null; 184 private RemoveInventoryItem handlerRemoveInventoryItem = null;
185 private RemoveInventoryFolder handlerRemoveInventoryFolder = null; 185 private RemoveInventoryFolder handlerRemoveInventoryFolder = null;
186 private RequestTaskInventory handlerRequestTaskInventory = null; //OnRequestTaskInventory; 186 private RequestTaskInventory handlerRequestTaskInventory = null; //OnRequestTaskInventory;
@@ -3618,11 +3618,11 @@ namespace OpenSim.Region.ClientStack
3618 case PacketType.CreateInventoryFolder: 3618 case PacketType.CreateInventoryFolder:
3619 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; 3619 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
3620 3620
3621 handler050 = OnCreateNewInventoryFolder; 3621 handlerCreateInventoryFolder = OnCreateNewInventoryFolder;
3622 if (handler050 != null) 3622 if (handlerCreateInventoryFolder != null)
3623 { 3623 {
3624 3624
3625 handler050(this, invFolder.FolderData.FolderID, 3625 handlerCreateInventoryFolder(this, invFolder.FolderData.FolderID,
3626 (ushort)invFolder.FolderData.Type, 3626 (ushort)invFolder.FolderData.Type,
3627 Util.FieldToString(invFolder.FolderData.Name), 3627 Util.FieldToString(invFolder.FolderData.Name),
3628 invFolder.FolderData.ParentID); 3628 invFolder.FolderData.ParentID);
@@ -3633,12 +3633,12 @@ namespace OpenSim.Region.ClientStack
3633 { 3633 {
3634 UpdateInventoryFolderPacket invFolderx = (UpdateInventoryFolderPacket)Pack; 3634 UpdateInventoryFolderPacket invFolderx = (UpdateInventoryFolderPacket)Pack;
3635 3635
3636 handler051 = null; 3636 handlerUpdateInventoryFolder = null;
3637 3637
3638 for (int i = 0; i < invFolderx.FolderData.Length; i++) 3638 for (int i = 0; i < invFolderx.FolderData.Length; i++)
3639 { 3639 {
3640 handler051 = OnUpdateInventoryFolder; 3640 handlerUpdateInventoryFolder = OnUpdateInventoryFolder;
3641 if (handler051 != null) 3641 if (handlerUpdateInventoryFolder != null)
3642 { 3642 {
3643 OnUpdateInventoryFolder(this, invFolderx.FolderData[i].FolderID, 3643 OnUpdateInventoryFolder(this, invFolderx.FolderData[i].FolderID,
3644 (ushort)invFolderx.FolderData[i].Type, 3644 (ushort)invFolderx.FolderData[i].Type,
@@ -3653,12 +3653,12 @@ namespace OpenSim.Region.ClientStack
3653 { 3653 {
3654 MoveInventoryFolderPacket invFoldery = (MoveInventoryFolderPacket)Pack; 3654 MoveInventoryFolderPacket invFoldery = (MoveInventoryFolderPacket)Pack;
3655 3655
3656 handler052 = null; 3656 handlerMoveInventoryFolder = null;
3657 3657
3658 for (int i = 0; i < invFoldery.InventoryData.Length; i++) 3658 for (int i = 0; i < invFoldery.InventoryData.Length; i++)
3659 { 3659 {
3660 handler052 = OnMoveInventoryFolder; 3660 handlerMoveInventoryFolder = OnMoveInventoryFolder;
3661 if (handler052 != null) 3661 if (handlerMoveInventoryFolder != null)
3662 { 3662 {
3663 OnMoveInventoryFolder(this, invFoldery.InventoryData[i].FolderID, 3663 OnMoveInventoryFolder(this, invFoldery.InventoryData[i].FolderID,
3664 invFoldery.InventoryData[i].ParentID); 3664 invFoldery.InventoryData[i].ParentID);
@@ -3669,10 +3669,10 @@ namespace OpenSim.Region.ClientStack
3669 case PacketType.CreateInventoryItem: 3669 case PacketType.CreateInventoryItem:
3670 CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; 3670 CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
3671 3671
3672 handler053 = OnCreateNewInventoryItem; 3672 handlerCreateNewInventoryItem = OnCreateNewInventoryItem;
3673 if (handler053 != null) 3673 if (handlerCreateNewInventoryItem != null)
3674 { 3674 {
3675 handler053(this, createItem.InventoryBlock.TransactionID, 3675 handlerCreateNewInventoryItem(this, createItem.InventoryBlock.TransactionID,
3676 createItem.InventoryBlock.FolderID, 3676 createItem.InventoryBlock.FolderID,
3677 createItem.InventoryBlock.CallbackID, 3677 createItem.InventoryBlock.CallbackID,
3678 Util.FieldToString(createItem.InventoryBlock.Description), 3678 Util.FieldToString(createItem.InventoryBlock.Description),
@@ -3688,13 +3688,13 @@ namespace OpenSim.Region.ClientStack
3688 { 3688 {
3689 FetchInventoryPacket FetchInventoryx = (FetchInventoryPacket)Pack; 3689 FetchInventoryPacket FetchInventoryx = (FetchInventoryPacket)Pack;
3690 3690
3691 handler054 = null; 3691 handlerFetchInventory = null;
3692 3692
3693 for (int i = 0; i < FetchInventoryx.InventoryData.Length; i++) 3693 for (int i = 0; i < FetchInventoryx.InventoryData.Length; i++)
3694 { 3694 {
3695 handler054 = OnFetchInventory; 3695 handlerFetchInventory = OnFetchInventory;
3696 3696
3697 if (handler054 != null) 3697 if (handlerFetchInventory != null)
3698 { 3698 {
3699 OnFetchInventory(this, FetchInventoryx.InventoryData[i].ItemID, 3699 OnFetchInventory(this, FetchInventoryx.InventoryData[i].ItemID,
3700 FetchInventoryx.InventoryData[i].OwnerID); 3700 FetchInventoryx.InventoryData[i].OwnerID);
@@ -3705,11 +3705,11 @@ namespace OpenSim.Region.ClientStack
3705 case PacketType.FetchInventoryDescendents: 3705 case PacketType.FetchInventoryDescendents:
3706 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; 3706 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
3707 3707
3708 handler055 = OnFetchInventoryDescendents; 3708 handlerFetchInventoryDescendents = OnFetchInventoryDescendents;
3709 if (handler055 != null) 3709 if (handlerFetchInventoryDescendents != null)
3710 { 3710 {
3711 3711
3712 handler055(this, Fetch.InventoryData.FolderID, Fetch.InventoryData.OwnerID, 3712 handlerFetchInventoryDescendents(this, Fetch.InventoryData.FolderID, Fetch.InventoryData.OwnerID,
3713 Fetch.InventoryData.FetchFolders, Fetch.InventoryData.FetchItems, 3713 Fetch.InventoryData.FetchFolders, Fetch.InventoryData.FetchItems,
3714 Fetch.InventoryData.SortOrder); 3714 Fetch.InventoryData.SortOrder);
3715 } 3715 }
@@ -3718,22 +3718,22 @@ namespace OpenSim.Region.ClientStack
3718 3718
3719 PurgeInventoryDescendentsPacket Purge = (PurgeInventoryDescendentsPacket)Pack; 3719 PurgeInventoryDescendentsPacket Purge = (PurgeInventoryDescendentsPacket)Pack;
3720 3720
3721 handler056 = OnPurgeInventoryDescendents; 3721 handlerPurgeInventoryDescendents = OnPurgeInventoryDescendents;
3722 if (handler056 != null) 3722 if (handlerPurgeInventoryDescendents != null)
3723 { 3723 {
3724 handler056(this, Purge.InventoryData.FolderID); 3724 handlerPurgeInventoryDescendents(this, Purge.InventoryData.FolderID);
3725 } 3725 }
3726 break; 3726 break;
3727 case PacketType.UpdateInventoryItem: 3727 case PacketType.UpdateInventoryItem:
3728 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; 3728 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
3729 if (OnUpdateInventoryItem != null) 3729 if (OnUpdateInventoryItem != null)
3730 { 3730 {
3731 handler057 = null; 3731 handlerUpdateInventoryItem = null;
3732 for (int i = 0; i < update.InventoryData.Length; i++) 3732 for (int i = 0; i < update.InventoryData.Length; i++)
3733 { 3733 {
3734 handler057 = OnUpdateInventoryItem; 3734 handlerUpdateInventoryItem = OnUpdateInventoryItem;
3735 3735
3736 if (handler057 != null) 3736 if (handlerUpdateInventoryItem != null)
3737 { 3737 {
3738 OnUpdateInventoryItem(this, update.InventoryData[i].TransactionID, 3738 OnUpdateInventoryItem(this, update.InventoryData[i].TransactionID,
3739 update.InventoryData[i].ItemID, 3739 update.InventoryData[i].ItemID,
@@ -3777,15 +3777,15 @@ namespace OpenSim.Region.ClientStack
3777 case PacketType.CopyInventoryItem: 3777 case PacketType.CopyInventoryItem:
3778 CopyInventoryItemPacket copyitem = (CopyInventoryItemPacket)Pack; 3778 CopyInventoryItemPacket copyitem = (CopyInventoryItemPacket)Pack;
3779 3779
3780 handler058 = null; 3780 handlerCopyInventoryItem = null;
3781 if (OnCopyInventoryItem != null) 3781 if (OnCopyInventoryItem != null)
3782 { 3782 {
3783 foreach (CopyInventoryItemPacket.InventoryDataBlock datablock in copyitem.InventoryData) 3783 foreach (CopyInventoryItemPacket.InventoryDataBlock datablock in copyitem.InventoryData)
3784 { 3784 {
3785 handler058 = OnCopyInventoryItem; 3785 handlerCopyInventoryItem = OnCopyInventoryItem;
3786 if (handler058 != null) 3786 if (handlerCopyInventoryItem != null)
3787 { 3787 {
3788 handler058(this, datablock.CallbackID, datablock.OldAgentID, 3788 handlerCopyInventoryItem(this, datablock.CallbackID, datablock.OldAgentID,
3789 datablock.OldItemID, datablock.NewFolderID, 3789 datablock.OldItemID, datablock.NewFolderID,
3790 Util.FieldToString(datablock.NewName)); 3790 Util.FieldToString(datablock.NewName));
3791 } 3791 }
@@ -3796,13 +3796,13 @@ namespace OpenSim.Region.ClientStack
3796 MoveInventoryItemPacket moveitem = (MoveInventoryItemPacket)Pack; 3796 MoveInventoryItemPacket moveitem = (MoveInventoryItemPacket)Pack;
3797 if (OnMoveInventoryItem != null) 3797 if (OnMoveInventoryItem != null)
3798 { 3798 {
3799 handler059 = null; 3799 handlerMoveInventoryItem = null;
3800 foreach (MoveInventoryItemPacket.InventoryDataBlock datablock in moveitem.InventoryData) 3800 foreach (MoveInventoryItemPacket.InventoryDataBlock datablock in moveitem.InventoryData)
3801 { 3801 {
3802 handler059 = OnMoveInventoryItem; 3802 handlerMoveInventoryItem = OnMoveInventoryItem;
3803 if (handler059 != null) 3803 if (handlerMoveInventoryItem != null)
3804 { 3804 {
3805 handler059(this, datablock.FolderID, datablock.ItemID, datablock.Length, 3805 handlerMoveInventoryItem(this, datablock.FolderID, datablock.ItemID, datablock.Length,
3806 Util.FieldToString(datablock.NewName)); 3806 Util.FieldToString(datablock.NewName));
3807 } 3807 }
3808 } 3808 }