aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-28 01:06:18 +0100
committerJustin Clark-Casey (justincc)2012-03-28 01:06:18 +0100
commitcb41fb64beb23c931216f038a50a48fb25d23198 (patch)
tree122d3c0db4593ac2e3ca2abf1d13b7d22188cedb /OpenSim
parentminor: clean up some code formatting in VivoxVoiceModule.cs (diff)
parentReverse a conditional in XInventory that made updating system folder evrsion ... (diff)
downloadopensim-SC_OLD-cb41fb64beb23c931216f038a50a48fb25d23198.zip
opensim-SC_OLD-cb41fb64beb23c931216f038a50a48fb25d23198.tar.gz
opensim-SC_OLD-cb41fb64beb23c931216f038a50a48fb25d23198.tar.bz2
opensim-SC_OLD-cb41fb64beb23c931216f038a50a48fb25d23198.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs2
-rw-r--r--OpenSim/Services/HypergridService/HGInventoryService.cs2
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs2
3 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 10ab6d0..77573c3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
167 167
168 public List<InventoryFolderBase> GetInventorySkeleton(UUID userId) 168 public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
169 { 169 {
170 return new List<InventoryFolderBase>(); 170 return m_RemoteConnector.GetInventorySkeleton(userId);
171 } 171 }
172 172
173 public InventoryCollection GetUserInventory(UUID userID) 173 public InventoryCollection GetUserInventory(UUID userID)
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);