aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2010-09-02 00:04:17 +0100
committerMelanie2010-09-02 00:04:17 +0100
commit203b7de2663934ae5e7f88061d97284dac961568 (patch)
treef1a6bf77fb06d9e3883e23b3c41f54e26e9c24d6 /OpenSim/Services
parentUpdate: Allow the version to increase only (diff)
downloadopensim-SC_OLD-203b7de2663934ae5e7f88061d97284dac961568.zip
opensim-SC_OLD-203b7de2663934ae5e7f88061d97284dac961568.tar.gz
opensim-SC_OLD-203b7de2663934ae5e7f88061d97284dac961568.tar.bz2
opensim-SC_OLD-203b7de2663934ae5e7f88061d97284dac961568.tar.xz
Allow increasing the version in system folders
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs8
1 files changed, 7 insertions, 1 deletions
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
309 return AddFolder(folder); 309 return AddFolder(folder);
310 310
311 if (check.Type != -1 || xFolder.type != -1) 311 if (check.Type != -1 || xFolder.type != -1)
312 return false; 312 {
313 if (xFolder.version > check.Version)
314 return false;
315 check.Version = xFolder.version;
316 xFolder = ConvertFromOpenSim(check);
317 return m_Database.StoreFolder(xFolder);
318 }
313 319
314 if (xFolder.version < check.Version) 320 if (xFolder.version < check.Version)
315 xFolder.version = check.Version; 321 xFolder.version = check.Version;