OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.7.4.1
Justin Clark-Casey (justincc) 2012-05-18 23:55:18 +01:00
parent 0147dc6302
commit 896cd45939
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Services/InventoryService/XInventoryService.cs
View File

@ -307,14 +307,20 @@ namespace OpenSim.Services.InventoryService
if (check != null) if (check != null)
return false; return false;
if (folder.Type == (short)AssetType.Folder || folder.Type == (short)AssetType.Unknown || if (folder.Type == (short)AssetType.Folder
GetFolderForType(folder.Owner, (AssetType)(folder.Type)) == null) || folder.Type == (short)AssetType.Unknown
|| folder.Type == (short)AssetType.OutfitFolder
|| GetFolderForType(folder.Owner, (AssetType)(folder.Type)) == null)
{ {
XInventoryFolder xFolder = ConvertFromOpenSim(folder); XInventoryFolder xFolder = ConvertFromOpenSim(folder);
return m_Database.StoreFolder(xFolder); return m_Database.StoreFolder(xFolder);
} }
else else
m_log.DebugFormat("[XINVENTORY]: Folder {0} of type {1} already exists", folder.Name, folder.Type); {
m_log.WarnFormat(
"[XINVENTORY]: Folder of type {0} already exists when tried to add {1} to {2} for {3}",
folder.Type, folder.Name, folder.ParentID, folder.Owner);
}
return false; return false;
} }