diff options
author | UbitUmarov | 2012-09-24 21:22:08 +0100 |
---|---|---|
committer | UbitUmarov | 2012-09-24 21:22:08 +0100 |
commit | ca67ee60ac0e0c26d6d32fc68d48ef63570f034d (patch) | |
tree | e87d8623aa44927b220e783d7265a50af10b295f /OpenSim/Region/Framework | |
parent | Merge branch 'ubitwork' into avination (diff) | |
download | opensim-SC-ca67ee60ac0e0c26d6d32fc68d48ef63570f034d.zip opensim-SC-ca67ee60ac0e0c26d6d32fc68d48ef63570f034d.tar.gz opensim-SC-ca67ee60ac0e0c26d6d32fc68d48ef63570f034d.tar.bz2 opensim-SC-ca67ee60ac0e0c26d6d32fc68d48ef63570f034d.tar.xz |
add missing transactionID in SendInventoryItemCreateUpdate. and make use
of it on inventoryAccessModule, etc. Most likelly it's needs where there
is a transactionID not zero
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 2d9a035..dd9210f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -904,11 +904,22 @@ namespace OpenSim.Region.Framework.Scenes | |||
904 | public void CreateNewInventoryItem( | 904 | public void CreateNewInventoryItem( |
905 | IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, | 905 | IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, |
906 | string name, string description, uint flags, uint callbackID, | 906 | string name, string description, uint flags, uint callbackID, |
907 | AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate) | 907 | AssetBase asset, sbyte invType, uint nextOwnerMask, int creationDate, UUID transationID) |
908 | { | 908 | { |
909 | CreateNewInventoryItem( | 909 | CreateNewInventoryItem( |
910 | remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, asset, invType, | 910 | remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, asset, invType, |
911 | (uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate); | 911 | (uint)PermissionMask.All, (uint)PermissionMask.All, 0, nextOwnerMask, 0, creationDate, transationID); |
912 | } | ||
913 | |||
914 | |||
915 | private void CreateNewInventoryItem( | ||
916 | IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, | ||
917 | string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType, | ||
918 | uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate) | ||
919 | { | ||
920 | CreateNewInventoryItem(remoteClient, creatorID, creatorData, folderID, | ||
921 | name, description, flags, callbackID, asset, invType, | ||
922 | baseMask, currentMask, everyoneMask, nextOwnerMask, groupMask, creationDate, UUID.Zero); | ||
912 | } | 923 | } |
913 | 924 | ||
914 | /// <summary> | 925 | /// <summary> |
@@ -933,7 +944,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
933 | private void CreateNewInventoryItem( | 944 | private void CreateNewInventoryItem( |
934 | IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, | 945 | IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, |
935 | string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType, | 946 | string name, string description, uint flags, uint callbackID, AssetBase asset, sbyte invType, |
936 | uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate) | 947 | uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate,UUID transationID) |
937 | { | 948 | { |
938 | InventoryItemBase item = new InventoryItemBase(); | 949 | InventoryItemBase item = new InventoryItemBase(); |
939 | item.Owner = remoteClient.AgentId; | 950 | item.Owner = remoteClient.AgentId; |
@@ -956,7 +967,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
956 | 967 | ||
957 | if (AddInventoryItem(item)) | 968 | if (AddInventoryItem(item)) |
958 | { | 969 | { |
959 | remoteClient.SendInventoryItemCreateUpdate(item, callbackID); | 970 | remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID); |
960 | } | 971 | } |
961 | else | 972 | else |
962 | { | 973 | { |