diff options
Diffstat (limited to 'OpenSim/Services/InventoryService/XInventoryService.cs')
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 8 |
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; |