diff options
author | UbitUmarov | 2015-09-11 04:46:15 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-11 04:46:15 +0100 |
commit | 6a0465b70ad3ef64d6e71aab2e624bf3bfddf9b2 (patch) | |
tree | d30b14a253b15436d60d9647c993793066b7c34d /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | add a few terminating / in LSLhttp uris as core (diff) | |
download | opensim-SC_OLD-6a0465b70ad3ef64d6e71aab2e624bf3bfddf9b2.zip opensim-SC_OLD-6a0465b70ad3ef64d6e71aab2e624bf3bfddf9b2.tar.gz opensim-SC_OLD-6a0465b70ad3ef64d6e71aab2e624bf3bfddf9b2.tar.bz2 opensim-SC_OLD-6a0465b70ad3ef64d6e71aab2e624bf3bfddf9b2.tar.xz |
remove diva's inventory cache since it seems to cause mantis 7720, broken items UUID. Guess it doesn't cover all paths
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index edb881f..2f37483 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -898,33 +898,33 @@ namespace OpenSim.Region.Framework.Scenes | |||
898 | } | 898 | } |
899 | 899 | ||
900 | 900 | ||
901 | if (remoteClient.AgentId == oldAgentID | 901 | if (remoteClient.AgentId == oldAgentID |
902 | || (LibraryService != null | 902 | || (LibraryService != null |
903 | && LibraryService.LibraryRootFolder != null | 903 | && LibraryService.LibraryRootFolder != null |
904 | && oldAgentID == LibraryService.LibraryRootFolder.Owner)) | 904 | && oldAgentID == LibraryService.LibraryRootFolder.Owner)) |
905 | { | ||
906 | CreateNewInventoryItem( | ||
907 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, | ||
908 | newName, item.Description, item.Flags, callbackID, item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType, | ||
909 | item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, | ||
910 | item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false); | ||
911 | } | ||
912 | else | ||
913 | { | ||
914 | // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item. | ||
915 | if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) | ||
916 | && (m_permissions.BypassPermissions() | ||
917 | || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID))) | ||
918 | { | 905 | { |
919 | CreateNewInventoryItem( | 906 | CreateNewInventoryItem( |
920 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID, | 907 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, |
921 | item.AssetID, (sbyte)item.AssetType, (sbyte) item.InvType, | 908 | newName, item.Description, item.Flags, callbackID, item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType, |
922 | item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, | 909 | item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions, |
923 | item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false); | 910 | item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false); |
924 | } | 911 | } |
912 | else | ||
913 | { | ||
914 | // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item. | ||
915 | if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0) | ||
916 | && (m_permissions.BypassPermissions() | ||
917 | || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID))) | ||
918 | { | ||
919 | CreateNewInventoryItem( | ||
920 | remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID, | ||
921 | item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType, | ||
922 | item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions, | ||
923 | item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false); | ||
924 | } | ||
925 | } | ||
925 | } | 926 | } |
926 | } | 927 | else |
927 | else | ||
928 | { | 928 | { |
929 | m_log.ErrorFormat( | 929 | m_log.ErrorFormat( |
930 | "[AGENT INVENTORY]: Could not copy item {0} since asset {1} could not be found", | 930 | "[AGENT INVENTORY]: Could not copy item {0} since asset {1} could not be found", |