diff options
author | Diva Canto | 2014-05-18 23:01:55 -0700 |
---|---|---|
committer | Diva Canto | 2014-05-18 23:01:55 -0700 |
commit | ab1472e5b7649702aec0585fa4b9d6a5d87948a4 (patch) | |
tree | 60d6c0e1330870322bf2b2cf972d3ad867eb150a /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Don't fetch assets from the server when doing simple inventory operations lik... (diff) | |
download | opensim-SC_OLD-ab1472e5b7649702aec0585fa4b9d6a5d87948a4.zip opensim-SC_OLD-ab1472e5b7649702aec0585fa4b9d6a5d87948a4.tar.gz opensim-SC_OLD-ab1472e5b7649702aec0585fa4b9d6a5d87948a4.tar.bz2 opensim-SC_OLD-ab1472e5b7649702aec0585fa4b9d6a5d87948a4.tar.xz |
Don't trigger ItemUploaded when no item has been uploaded.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 71e3032..542d454 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -891,7 +891,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
891 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, | 891 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, |
892 | newName, item.Description, item.Flags, callbackID, item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType, | 892 | newName, item.Description, item.Flags, callbackID, item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType, |
893 | item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, | 893 | item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, |
894 | item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch()); | 894 | item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false); |
895 | } | 895 | } |
896 | else | 896 | else |
897 | { | 897 | { |
@@ -904,7 +904,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
904 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID, | 904 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID, |
905 | item.AssetID, (sbyte)item.AssetType, (sbyte) item.InvType, | 905 | item.AssetID, (sbyte)item.AssetType, (sbyte) item.InvType, |
906 | item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, | 906 | item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, |
907 | item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch()); | 907 | item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false); |
908 | } | 908 | } |
909 | } | 909 | } |
910 | } | 910 | } |
@@ -960,7 +960,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
960 | { | 960 | { |
961 | CreateNewInventoryItem( | 961 | CreateNewInventoryItem( |
962 | remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, assetID, assetType, invType, | 962 | remoteClient, creatorID, creatorData, folderID, name, description, flags, callbackID, assetID, assetType, invType, |
963 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, 0, nextOwnerMask, 0, creationDate); | 963 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, 0, nextOwnerMask, 0, |
964 | creationDate, true); | ||
964 | } | 965 | } |
965 | 966 | ||
966 | /// <summary> | 967 | /// <summary> |
@@ -985,7 +986,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
985 | private void CreateNewInventoryItem( | 986 | private void CreateNewInventoryItem( |
986 | IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, | 987 | IClientAPI remoteClient, string creatorID, string creatorData, UUID folderID, |
987 | string name, string description, uint flags, uint callbackID, UUID assetID, sbyte assetType, sbyte invType, | 988 | string name, string description, uint flags, uint callbackID, UUID assetID, sbyte assetType, sbyte invType, |
988 | uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate) | 989 | uint baseMask, uint currentMask, uint everyoneMask, uint nextOwnerMask, uint groupMask, int creationDate, |
990 | bool assetUpload) | ||
989 | { | 991 | { |
990 | InventoryItemBase item = new InventoryItemBase(); | 992 | InventoryItemBase item = new InventoryItemBase(); |
991 | item.Owner = remoteClient.AgentId; | 993 | item.Owner = remoteClient.AgentId; |
@@ -1006,7 +1008,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1006 | item.BasePermissions = baseMask; | 1008 | item.BasePermissions = baseMask; |
1007 | item.CreationDate = creationDate; | 1009 | item.CreationDate = creationDate; |
1008 | 1010 | ||
1009 | if (AddInventoryItem(item)) | 1011 | if (AddInventoryItem(item, assetUpload)) |
1010 | { | 1012 | { |
1011 | remoteClient.SendInventoryItemCreateUpdate(item, callbackID); | 1013 | remoteClient.SendInventoryItemCreateUpdate(item, callbackID); |
1012 | } | 1014 | } |
@@ -1073,7 +1075,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1073 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, | 1075 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, |
1074 | name, description, 0, callbackID, olditemID, type, invType, | 1076 | name, description, 0, callbackID, olditemID, type, invType, |
1075 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All, | 1077 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All, |
1076 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch()); | 1078 | (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch(), |
1079 | false); | ||
1077 | } | 1080 | } |
1078 | else | 1081 | else |
1079 | { | 1082 | { |