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

Fix up merge artifacts

viewer-2-initial-appearance
Melanie 2010-12-21 20:54:28 +00:00
parent 043dace118
commit a31b96e1ba
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@ -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) foreach (TaskInventoryItem item in m_items.Values)
{ {
UUID ownerID = item.OwnerID; UUID ownerID = item.OwnerID;
@ -840,10 +836,7 @@ namespace OpenSim.Region.Framework.Scenes
invString.AddNameValueLine("group_id", item.GroupID.ToString()); invString.AddNameValueLine("group_id", item.GroupID.ToString());
invString.AddSectionEnd(); invString.AddSectionEnd();
if (includeAssets) invString.AddNameValueLine("asset_id", item.AssetID.ToString());
invString.AddNameValueLine("asset_id", item.AssetID.ToString());
else
invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); 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); m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
if (m_inventoryFileData.Length > 2) if (m_inventoryFileData.Length > 2)