From 6a0465b70ad3ef64d6e71aab2e624bf3bfddf9b2 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 11 Sep 2015 04:46:15 +0100
Subject:  remove diva's inventory cache since it seems to cause mantis 7720,
 broken items UUID. Guess it doesn't cover all paths

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

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
                 }
 
 
-            if (remoteClient.AgentId == oldAgentID
-                || (LibraryService != null
-                    && LibraryService.LibraryRootFolder != null
-                    && oldAgentID == LibraryService.LibraryRootFolder.Owner))
-            {
-                CreateNewInventoryItem(
-                    remoteClient, item.CreatorId, item.CreatorData, newFolderID,
-                    newName, item.Description, item.Flags, callbackID, item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType,
-                    item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions,
-                    item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false);
-            }
-            else
-            {  
-                // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
-                if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0)
-                    && (m_permissions.BypassPermissions()
-                        || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)))
+                if (remoteClient.AgentId == oldAgentID
+                    || (LibraryService != null
+                        && LibraryService.LibraryRootFolder != null
+                        && oldAgentID == LibraryService.LibraryRootFolder.Owner))
                 {
                     CreateNewInventoryItem(
-                        remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID,
-                        item.AssetID, (sbyte)item.AssetType, (sbyte) item.InvType,
-                        item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions,
+                        remoteClient, item.CreatorId, item.CreatorData, newFolderID,
+                        newName, item.Description, item.Flags, callbackID, item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType,
+                        item.BasePermissions, item.CurrentPermissions, item.EveryOnePermissions,
                         item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false);
                 }
+                else
+                {
+                    // If item is transfer or permissions are off or calling agent is allowed to copy item owner's inventory item.
+                    if (((item.CurrentPermissions & (uint)PermissionMask.Transfer) != 0)
+                        && (m_permissions.BypassPermissions()
+                            || m_permissions.CanCopyUserInventory(remoteClient.AgentId, oldItemID)))
+                    {
+                        CreateNewInventoryItem(
+                            remoteClient, item.CreatorId, item.CreatorData, newFolderID, newName, item.Description, item.Flags, callbackID,
+                            item.AssetID, (sbyte)item.AssetType, (sbyte)item.InvType,
+                            item.NextPermissions, item.NextPermissions, item.EveryOnePermissions & item.NextPermissions,
+                            item.NextPermissions, item.GroupPermissions, Util.UnixTimeSinceEpoch(), false);
+                    }
+                }
             }
-        }
-                      else
+            else
             {
                 m_log.ErrorFormat(
                     "[AGENT INVENTORY]: Could not copy item {0} since asset {1} could not be found",
-- 
cgit v1.1