diff options
| author | Justin Clark-Casey (justincc) | 2012-03-28 01:06:18 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-28 01:06:18 +0100 |
| commit | cb41fb64beb23c931216f038a50a48fb25d23198 (patch) | |
| tree | 122d3c0db4593ac2e3ca2abf1d13b7d22188cedb /OpenSim/Services/InventoryService | |
| parent | minor: clean up some code formatting in VivoxVoiceModule.cs (diff) | |
| parent | Reverse a conditional in XInventory that made updating system folder evrsion ... (diff) | |
| download | opensim-SC-cb41fb64beb23c931216f038a50a48fb25d23198.zip opensim-SC-cb41fb64beb23c931216f038a50a48fb25d23198.tar.gz opensim-SC-cb41fb64beb23c931216f038a50a48fb25d23198.tar.bz2 opensim-SC-cb41fb64beb23c931216f038a50a48fb25d23198.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/InventoryService')
| -rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 8c57d17..7b2c3a6 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
| @@ -318,7 +318,7 @@ namespace OpenSim.Services.InventoryService | |||
| 318 | 318 | ||
| 319 | if (check.Type != -1 || xFolder.type != -1) | 319 | if (check.Type != -1 || xFolder.type != -1) |
| 320 | { | 320 | { |
| 321 | if (xFolder.version > check.Version) | 321 | if (xFolder.version < check.Version) |
| 322 | return false; | 322 | return false; |
| 323 | check.Version = (ushort)xFolder.version; | 323 | check.Version = (ushort)xFolder.version; |
| 324 | xFolder = ConvertFromOpenSim(check); | 324 | xFolder = ConvertFromOpenSim(check); |