diff options
| author | Melanie | 2012-03-27 23:14:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-27 23:14:43 +0100 |
| commit | b18b1b1d700d4a5ffd306e5b69a08b241188c525 (patch) | |
| tree | 2bb99cd8095a9b562f9ee075274508da973dd2a2 /OpenSim/Services/InventoryService | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Reverse a conditional in XInventory that made updating system folder evrsion ... (diff) | |
| download | opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.zip opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.gz opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.bz2 opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -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); |