From 203b7de2663934ae5e7f88061d97284dac961568 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 2 Sep 2010 00:04:17 +0100
Subject: Allow increasing the version in system folders

---
 OpenSim/Services/InventoryService/XInventoryService.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index febb0af..97af44d 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -309,7 +309,13 @@ namespace OpenSim.Services.InventoryService
                 return AddFolder(folder);
 
             if (check.Type != -1 || xFolder.type != -1)
-                return false;
+            {
+                if (xFolder.version > check.Version)
+                    return false;
+                check.Version = xFolder.version;
+                xFolder = ConvertFromOpenSim(check);
+                return m_Database.StoreFolder(xFolder);
+            }
 
             if (xFolder.version < check.Version)
                 xFolder.version = check.Version;
-- 
cgit v1.1