diff options
author | Justin Clark-Casey (justincc) | 2012-05-18 23:55:18 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-18 23:55:18 +0100 |
commit | 896cd459391809d2fb140fe345c78f8b952232d8 (patch) | |
tree | 2fa63aee2e5521542635bf16407b638e9bf1ba4b /OpenSim | |
parent | Fix build break. Comment out EQG deregister/register logging. (diff) | |
download | opensim-SC_OLD-896cd459391809d2fb140fe345c78f8b952232d8.zip opensim-SC_OLD-896cd459391809d2fb140fe345c78f8b952232d8.tar.gz opensim-SC_OLD-896cd459391809d2fb140fe345c78f8b952232d8.tar.bz2 opensim-SC_OLD-896cd459391809d2fb140fe345c78f8b952232d8.tar.xz |
Fix issue where a new outfit folder is not created when a new outfit is saved if there are no previous outfits
This was because AddFolder() was disallowing these though they are legal.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index 15156d0..eed88bd 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
@@ -307,14 +307,20 @@ namespace OpenSim.Services.InventoryService | |||
307 | if (check != null) | 307 | if (check != null) |
308 | return false; | 308 | return false; |
309 | 309 | ||
310 | if (folder.Type == (short)AssetType.Folder || folder.Type == (short)AssetType.Unknown || | 310 | if (folder.Type == (short)AssetType.Folder |
311 | GetFolderForType(folder.Owner, (AssetType)(folder.Type)) == null) | 311 | || folder.Type == (short)AssetType.Unknown |
312 | || folder.Type == (short)AssetType.OutfitFolder | ||
313 | || GetFolderForType(folder.Owner, (AssetType)(folder.Type)) == null) | ||
312 | { | 314 | { |
313 | XInventoryFolder xFolder = ConvertFromOpenSim(folder); | 315 | XInventoryFolder xFolder = ConvertFromOpenSim(folder); |
314 | return m_Database.StoreFolder(xFolder); | 316 | return m_Database.StoreFolder(xFolder); |
315 | } | 317 | } |
316 | else | 318 | else |
317 | m_log.DebugFormat("[XINVENTORY]: Folder {0} of type {1} already exists", folder.Name, folder.Type); | 319 | { |
320 | m_log.WarnFormat( | ||
321 | "[XINVENTORY]: Folder of type {0} already exists when tried to add {1} to {2} for {3}", | ||
322 | folder.Type, folder.Name, folder.ParentID, folder.Owner); | ||
323 | } | ||
318 | 324 | ||
319 | return false; | 325 | return false; |
320 | } | 326 | } |