diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Services/InventoryService/XInventoryService.cs')
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index af831fd..f48bf60 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -200,7 +200,14 @@ namespace OpenSim.Services.InventoryService | |||
200 | if (folders.Length == 0) | 200 | if (folders.Length == 0) |
201 | return null; | 201 | return null; |
202 | 202 | ||
203 | return ConvertToOpenSim(folders[0]); | 203 | XInventoryFolder root = null; |
204 | foreach (XInventoryFolder folder in folders) | ||
205 | if (folder.folderName == "My Inventory") | ||
206 | root = folder; | ||
207 | if (folders == null) // oops | ||
208 | root = folders[0]; | ||
209 | |||
210 | return ConvertToOpenSim(root); | ||
204 | } | 211 | } |
205 | 212 | ||
206 | public virtual InventoryFolderBase GetFolderForType(UUID principalID, AssetType type) | 213 | public virtual InventoryFolderBase GetFolderForType(UUID principalID, AssetType type) |