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/Region | |
| 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_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/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 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) |