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

Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-05-18 20:49:29 -04:00
parent 477b67e1e6 247a56593f
commit 13187aca91
2 changed files with 13 additions and 8 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;
} }

9
bin/OpenSimDefaults.ini
View File

@ -601,13 +601,12 @@
Cap_ViewerStartAuction = "" Cap_ViewerStartAuction = ""
Cap_ViewerStats = "" Cap_ViewerStats = ""
; The various fetch inventory caps are supported by OpenSim, but may ; Capabilities for fetching inventory over HTTP rather than UDP
; lead to poor sim performance if served by the simulators,
; so they are currently disabled by default.
; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above) ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above)
; It appears that Linden Lab viewer 3.3.1 onwards will not work properly if FetchInventoryDescendents2 and FetchInventory2 are not enabled
Cap_WebFetchInventoryDescendents = "" Cap_WebFetchInventoryDescendents = ""
Cap_FetchInventoryDescendents2 = "" Cap_FetchInventoryDescendents2 = "localhost"
Cap_FetchInventory2 = "" Cap_FetchInventory2 = "localhost"
[Chat] [Chat]