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

a few changes on universal id

Browse Source
This commit is contained in:
UbitUmarov
2022-03-15 01:41:49 +00:00
parent 7c9099de36
commit a46f0b4fd4
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1320,14 +1320,14 @@ namespace OpenSim.Region.ClientStack.Linden
m_Scene.TryGetClient(agentID, out client);
if (objectID != UUID.Zero)
if (!objectID.IsZero())
{
SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID);
if(part == null)
throw new Exception("failed to find object with notecard item" + notecardID.ToString());
TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID);
if (taskItem == null || taskItem.AssetID == UUID.Zero)
if (taskItem == null || taskItem.AssetID.IsZero())
throw new Exception("Failed to find notecard item" + notecardID.ToString());
if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, agentID))
@@ -1352,10 +1352,10 @@ namespace OpenSim.Region.ClientStack.Linden
return;
}
if (notecardID != UUID.Zero)
if (!notecardID.IsZero())
{
InventoryItemBase noteItem = m_Scene.InventoryService.GetItem(agentID, notecardID);
if (noteItem == null || noteItem.AssetID == UUID.Zero)
if (noteItem == null || noteItem.AssetID.IsZero())
throw new Exception("Failed to find notecard item" + notecardID.ToString());
noteAssetID = noteItem.AssetID;
}
@@ -1385,7 +1385,7 @@ namespace OpenSim.Region.ClientStack.Linden
// find where to put it
InventoryFolderBase folder = null;
if (folderID != UUID.Zero)
if (!folderID.IsZero())
folder = m_Scene.InventoryService.GetFolder(agentID, folderID);
if (folder == null && Enum.IsDefined(typeof(FolderType), (sbyte)item.AssetType))