diff options
author | Oren Hurvitz | 2014-03-24 18:00:59 +0200 |
---|---|---|
committer | Oren Hurvitz | 2014-03-24 17:02:13 +0100 |
commit | df9845a283d34c65d47b858a1c45934ee2ea6b3b (patch) | |
tree | 0d89e1d00c1401d692204f2198b45049b2509057 /OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |
parent | Fixed unit tests for delinking objects (diff) | |
download | opensim-SC-df9845a283d34c65d47b858a1c45934ee2ea6b3b.zip opensim-SC-df9845a283d34c65d47b858a1c45934ee2ea6b3b.tar.gz opensim-SC-df9845a283d34c65d47b858a1c45934ee2ea6b3b.tar.bz2 opensim-SC-df9845a283d34c65d47b858a1c45934ee2ea6b3b.tar.xz |
When a user logs-in, automatically create the Suitcase folder
This is only done if the Suitcase Inventory Service is used.
Previously the Suitcase was created at a later time, which meant that it wasn't shown in the viewer until the viewer was restarted.
Diffstat (limited to 'OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 90ce44a..1608039 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs | |||
@@ -215,25 +215,17 @@ namespace OpenSim.Services.HypergridService | |||
215 | if (suitcase == null) | 215 | if (suitcase == null) |
216 | { | 216 | { |
217 | m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder"); | 217 | m_log.ErrorFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to create suitcase folder"); |
218 | return null; | ||
218 | } | 219 | } |
219 | else | 220 | |
220 | { | 221 | m_Database.StoreFolder(suitcase); |
221 | m_Database.StoreFolder(suitcase); | ||
222 | |||
223 | // Create System folders | ||
224 | CreateSystemFolders(principalID, suitcase.folderID); | ||
225 | 222 | ||
226 | SetAsNormalFolder(suitcase); | 223 | CreateSystemFolders(principalID, suitcase.folderID); |
227 | |||
228 | return ConvertToOpenSim(suitcase); | ||
229 | } | ||
230 | } | ||
231 | else | ||
232 | { | ||
233 | return ConvertToOpenSim(suitcase); | ||
234 | } | 224 | } |
235 | 225 | ||
236 | return null; | 226 | SetAsNormalFolder(suitcase); |
227 | |||
228 | return ConvertToOpenSim(suitcase); | ||
237 | } | 229 | } |
238 | 230 | ||
239 | protected void CreateSystemFolders(UUID principalID, UUID rootID) | 231 | protected void CreateSystemFolders(UUID principalID, UUID rootID) |