diff options
author | Diva Canto | 2010-06-29 06:37:39 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Services/InventoryService | |
parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
parent | This file wants to be committed. (diff) | |
download | opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r-- | OpenSim/Services/InventoryService/HGInventoryService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Services/InventoryService/HGInventoryService.cs b/OpenSim/Services/InventoryService/HGInventoryService.cs index 061effe..6e6b019 100644 --- a/OpenSim/Services/InventoryService/HGInventoryService.cs +++ b/OpenSim/Services/InventoryService/HGInventoryService.cs | |||
@@ -108,13 +108,13 @@ namespace OpenSim.Services.InventoryService | |||
108 | // Warp! Root folder for travelers | 108 | // Warp! Root folder for travelers |
109 | XInventoryFolder[] folders = m_Database.GetFolders( | 109 | XInventoryFolder[] folders = m_Database.GetFolders( |
110 | new string[] { "agentID", "folderName"}, | 110 | new string[] { "agentID", "folderName"}, |
111 | new string[] { principalID.ToString(), "Suitcase" }); | 111 | new string[] { principalID.ToString(), "My Suitcase" }); |
112 | 112 | ||
113 | if (folders.Length > 0) | 113 | if (folders.Length > 0) |
114 | return ConvertToOpenSim(folders[0]); | 114 | return ConvertToOpenSim(folders[0]); |
115 | 115 | ||
116 | // make one | 116 | // make one |
117 | XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)AssetType.Folder, "Suitcase"); | 117 | XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)AssetType.Folder, "My Suitcase"); |
118 | return ConvertToOpenSim(suitcase); | 118 | return ConvertToOpenSim(suitcase); |
119 | } | 119 | } |
120 | 120 | ||
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) |