ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

mantis 8651: try to fix items embedded in notecards. This may need more work

Browse Source
This commit is contained in:
UbitUmarov
2020-02-06 06:12:51 +00:00
parent 3196d2fa6f
commit 18f2e25b23
2 changed files with 388 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@@ -1420,6 +1420,8 @@ namespace OpenSim.Region.ClientStack.Linden
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
InventoryItemBase copyItem = null;
IClientAPI client = null;
try
{
OSDMap content = (OSDMap)OSDParser.DeserializeLLSDXml(request);
@@ -1428,49 +1430,163 @@ namespace OpenSim.Region.ClientStack.Linden
UUID folderID = content["folder-id"].AsUUID();
UUID itemID = content["item-id"].AsUUID();
UUID noteAssetID = UUID.Zero;
// m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, FolderID:{0}, ItemID:{1}, NotecardID:{2}, ObjectID:{3}", folderID, itemID, notecardID, objectID);
m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client);
if (objectID != UUID.Zero)
{
SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID);
if (part != null)
{
// TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID);
if(part == null)
throw new Exception("find object with notecard item" + notecardID.ToString());
if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID))
return CopyInventoryFromNotecardError(httpResponse);
}
}
InventoryItemBase item = null;
IClientAPI client = null;
m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client);
item = m_Scene.InventoryService.GetItem(m_HostCapsObj.AgentID, itemID);
if (item != null)
{
string message;
copyItem = m_Scene.GiveInventoryItem(m_HostCapsObj.AgentID, item.Owner, itemID, folderID, out message);
if (copyItem != null && client != null)
{
m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder);
client.SendBulkUpdateInventory(copyItem);
}
TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID);
if(taskItem == null || taskItem.AssetID == UUID.Zero)
throw new Exception("Failed to find notecard item" + notecardID.ToString());
noteAssetID = taskItem.AssetID;
}
else
{
m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard - Failed to retrieve item {0} from notecard {1}", itemID, notecardID);
if (client != null)
client.SendAlertMessage("Failed to retrieve item");
InventoryItemBase localitem = m_Scene.InventoryService.GetItem(m_HostCapsObj.AgentID, itemID);
if (localitem != null)
{
string message;
copyItem = m_Scene.GiveInventoryItem(m_HostCapsObj.AgentID, localitem.Owner, itemID, folderID, out message);
if (copyItem == null)
throw new Exception("Failed to find notecard item" + notecardID.ToString());
m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder);
if (client != null)
client.SendBulkUpdateInventory(copyItem);
return "";
}
if (notecardID != UUID.Zero)
{
InventoryItemBase noteItem = m_Scene.InventoryService.GetItem(m_HostCapsObj.AgentID, notecardID);
if (noteItem == null || noteItem.AssetID == UUID.Zero)
throw new Exception("Failed to find notecard item" + notecardID.ToString());
noteAssetID = noteItem.AssetID;
}
}
AssetBase noteAsset = m_Scene.AssetService.Get(noteAssetID.ToString());
if (noteAsset == null || noteAsset.Type != (sbyte)AssetType.Notecard)
throw new Exception("Failed to find notecard asset" + notecardID.ToString());
InventoryItemBase item = SLUtil.GetEmbeddedItem(noteAsset.Data, itemID);
if(item == null)
throw new Exception("Failed to open notecard asset" + notecardID.ToString());
noteAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
if (noteAsset == null)
throw new Exception("Failed to find notecard " + notecardID.ToString() +" item "+ itemID.ToString() + " asset");
if (!m_Scene.Permissions.CanTransferUserInventory(itemID, item.Owner, m_HostCapsObj.AgentID))
throw new Exception("Notecard item permissions check fail" + notecardID.ToString());
if (!m_Scene.Permissions.BypassPermissions())
{
if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
throw new Exception("Notecard item permissions check fail" + notecardID.ToString());
}
if (m_Scene.Permissions.PropagatePermissions() && item.Owner != m_HostCapsObj.AgentID)
{
uint permsMask = ~((uint)PermissionMask.Copy |
(uint)PermissionMask.Transfer |
(uint)PermissionMask.Modify |
(uint)PermissionMask.Export);
uint nextPerms = permsMask | (item.NextPermissions &
((uint)PermissionMask.Copy |
(uint)PermissionMask.Transfer |
(uint)PermissionMask.Modify));
if (nextPerms == permsMask)
nextPerms |= (uint)PermissionMask.Transfer;
uint basePerms = item.BasePermissions |
(uint)PermissionMask.Move;
uint ownerPerms = item.CurrentPermissions;
uint foldedPerms = (item.CurrentPermissions & (uint)PermissionMask.FoldedMask) << (int)PermissionMask.FoldingShift;
if (foldedPerms != 0 && item.InvType == (int)InventoryType.Object)
{
foldedPerms |= permsMask;
bool isRootMod = (item.CurrentPermissions &
(uint)PermissionMask.Modify) != 0 ?
true : false;
ownerPerms &= foldedPerms;
basePerms &= foldedPerms;
if (isRootMod)
{
ownerPerms |= (uint)PermissionMask.Modify;
basePerms |= (uint)PermissionMask.Modify;
}
}
ownerPerms &= nextPerms;
basePerms &= nextPerms;
basePerms &= ~(uint)PermissionMask.FoldedMask;
basePerms |= ((basePerms >> 13) & 7) | (((basePerms & (uint)PermissionMask.Export) != 0) ? (uint)PermissionMask.FoldedExport : 0);
item.BasePermissions = basePerms;
item.CurrentPermissions = ownerPerms;
item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
item.Flags &= ~(uint)(InventoryItemFlags.ObjectOverwriteBase | InventoryItemFlags.ObjectOverwriteOwner | InventoryItemFlags.ObjectOverwriteGroup | InventoryItemFlags.ObjectOverwriteEveryone | InventoryItemFlags.ObjectOverwriteNextOwner);
item.NextPermissions = item.NextPermissions;
item.EveryOnePermissions = item.EveryOnePermissions & nextPerms;
item.GroupPermissions = 0;
}
InventoryFolderBase folder = null;
if (folderID != UUID.Zero)
folder = m_Scene.InventoryService.GetFolder(m_HostCapsObj.AgentID, folderID);
if (folder == null && Enum.IsDefined(typeof(FolderType), (sbyte)item.AssetType))
folder = m_Scene.InventoryService.GetFolderForType(m_HostCapsObj.AgentID, (FolderType)item.AssetType);
if(folder == null)
folder = m_Scene.InventoryService.GetRootFolder(m_HostCapsObj.AgentID);
if(folder == null)
throw new Exception("Failed to find a folder for the notecard item" + notecardID.ToString());
item.Folder = folder.ID;
UUID senderId = item.Owner;
item.Owner = m_HostCapsObj.AgentID;
IInventoryAccessModule invAccess = m_Scene.RequestModuleInterface<IInventoryAccessModule>();
if (invAccess != null)
invAccess.TransferInventoryAssets(item, senderId, m_HostCapsObj.AgentID);
if(!m_Scene.InventoryService.AddItem(item))
throw new Exception("Failed create the notecard item" + notecardID.ToString());
m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0} FolderID:{1}", item.ID, item.Folder);
if (client != null)
client.SendBulkUpdateInventory(item);
return "";
}
catch (Exception e)
{
m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard : {0}", e.ToString());
m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard : {0}", e.Message);
copyItem = null;
}
if(copyItem == null)
{
if (client != null)
client.SendAlertMessage("Failed to retrieve item");
return CopyInventoryFromNotecardError(httpResponse);
}
return "";
}