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

minor: extend commented out LinkInventoryItem log message for future use

0.7.3-extended
Justin Clark-Casey (justincc) 2012-05-21 21:00:22 +01:00
parent ba909cb692
commit 8e6459f616
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -896,8 +896,8 @@ namespace OpenSim.Region.Framework.Scenes
sbyte invType, sbyte type, UUID olditemID)
{
// m_log.DebugFormat(
// "[AGENT INVENTORY]: Received request from {0} to create inventory item link {1} in folder {2} pointing to {3}",
// remoteClient.Name, name, folderID, olditemID);
// "[AGENT INVENTORY]: Received request from {0} to create inventory item link {1} in folder {2} pointing to {3}, assetType {4}, inventoryType {5}",
// remoteClient.Name, name, folderID, olditemID, (AssetType)type, (InventoryType)invType);
if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
return;
@ -930,10 +930,10 @@ namespace OpenSim.Region.Framework.Scenes
asset.Type = type;
asset.Name = name;
asset.Description = description;
CreateNewInventoryItem(
remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, name, 0, callbackID, asset, invType,
(uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All,
remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, name, 0, callbackID, asset, invType,
(uint)PermissionMask.All, (uint)PermissionMask.All, (uint)PermissionMask.All,
(uint)PermissionMask.All, (uint)PermissionMask.All, Util.UnixTimeSinceEpoch());
}
else

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

@ -293,6 +293,8 @@ namespace OpenSim.Services.InventoryService
public virtual bool AddFolder(InventoryFolderBase folder)
{
// m_log.DebugFormat("[XINVENTORY]: Add folder {0} type {1} in parent {2}", folder.Name, folder.Type, folder.ParentID);
InventoryFolderBase check = GetFolder(folder);
if (check != null)
return false;
@ -336,7 +338,7 @@ namespace OpenSim.Services.InventoryService
check.Version = (ushort)xFolder.version;
xFolder = ConvertFromOpenSim(check);
// m_log.DebugFormat(
// "[XINVENTORY]: Storing version only update to system folder {0} {1} {2}",
// xFolder.folderName, xFolder.version, xFolder.type);
@ -421,7 +423,6 @@ namespace OpenSim.Services.InventoryService
public virtual bool UpdateItem(InventoryItemBase item)
{
// throw new Exception("urrgh");
if (!m_AllowDelete)
if (item.AssetType == (sbyte)AssetType.Link || item.AssetType == (sbyte)AssetType.LinkFolder)
return false;