Fix up merge artifacts
parent
043dace118
commit
a31b96e1ba
|
@ -808,10 +808,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
}
|
||||
|
||||
bool includeAssets = false;
|
||||
if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
|
||||
includeAssets = true;
|
||||
|
||||
foreach (TaskInventoryItem item in m_items.Values)
|
||||
{
|
||||
UUID ownerID = item.OwnerID;
|
||||
|
@ -840,10 +836,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
invString.AddNameValueLine("group_id", item.GroupID.ToString());
|
||||
invString.AddSectionEnd();
|
||||
|
||||
if (includeAssets)
|
||||
invString.AddNameValueLine("asset_id", item.AssetID.ToString());
|
||||
else
|
||||
invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
|
||||
invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
|
||||
invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
|
||||
invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
|
||||
|
@ -861,8 +854,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
}
|
||||
|
||||
int count = m_items.Count;
|
||||
|
||||
m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
|
||||
|
||||
if (m_inventoryFileData.Length > 2)
|
||||
|
|
Loading…
Reference in New Issue