diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index a1287fd..b29d803 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -53,8 +53,6 @@ namespace OpenSim.Services.HypergridService | |||
53 | LogManager.GetLogger( | 53 | LogManager.GetLogger( |
54 | MethodBase.GetCurrentMethod().DeclaringType); | 54 | MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | protected new IXInventoryData m_Database; | ||
57 | |||
58 | private string m_HomeURL; | 56 | private string m_HomeURL; |
59 | private IUserAccountService m_UserAccountService; | 57 | private IUserAccountService m_UserAccountService; |
60 | 58 | ||
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); |