aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/InventoryService
diff options
context:
space:
mode:
authorMelanie2010-09-02 00:02:07 +0100
committerMelanie2010-09-02 00:02:07 +0100
commit7efe7feef5cb4bb001387eb3b90e819a61ef9107 (patch)
tree147c8c037db6068915969cdf97ca9aea7b320fec /OpenSim/Services/InventoryService
parentDisallow modification of system folders. Prevent changing the type of folders (diff)
downloadopensim-SC_OLD-7efe7feef5cb4bb001387eb3b90e819a61ef9107.zip
opensim-SC_OLD-7efe7feef5cb4bb001387eb3b90e819a61ef9107.tar.gz
opensim-SC_OLD-7efe7feef5cb4bb001387eb3b90e819a61ef9107.tar.bz2
opensim-SC_OLD-7efe7feef5cb4bb001387eb3b90e819a61ef9107.tar.xz
Update: Allow the version to increase only
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 02d7170..febb0af 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -311,7 +311,8 @@ namespace OpenSim.Services.InventoryService
311 if (check.Type != -1 || xFolder.type != -1) 311 if (check.Type != -1 || xFolder.type != -1)
312 return false; 312 return false;
313 313
314 xFolder.version = check.Version; 314 if (xFolder.version < check.Version)
315 xFolder.version = check.Version;
315 xFolder.folderID = check.ID; 316 xFolder.folderID = check.ID;
316 317
317 return m_Database.StoreFolder(xFolder); 318 return m_Database.StoreFolder(xFolder);