diff options
author | Melanie | 2010-12-21 20:54:28 +0000 |
---|---|---|
committer | Melanie | 2010-12-21 20:54:28 +0000 |
commit | a31b96e1ba755122220d4dd8e5e04d721910a2fc (patch) | |
tree | f3be9fbbffe55dc960d28215516eac112bc87c92 /OpenSim/Region/Framework/Scenes | |
parent | Make prim inventories a bit more sane (diff) | |
download | opensim-SC_OLD-a31b96e1ba755122220d4dd8e5e04d721910a2fc.zip opensim-SC_OLD-a31b96e1ba755122220d4dd8e5e04d721910a2fc.tar.gz opensim-SC_OLD-a31b96e1ba755122220d4dd8e5e04d721910a2fc.tar.bz2 opensim-SC_OLD-a31b96e1ba755122220d4dd8e5e04d721910a2fc.tar.xz |
Fix up merge artifacts
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index ac69f16..36c5fc1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -808,10 +808,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
808 | } | 808 | } |
809 | } | 809 | } |
810 | 810 | ||
811 | bool includeAssets = false; | ||
812 | if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId)) | ||
813 | includeAssets = true; | ||
814 | |||
815 | foreach (TaskInventoryItem item in m_items.Values) | 811 | foreach (TaskInventoryItem item in m_items.Values) |
816 | { | 812 | { |
817 | UUID ownerID = item.OwnerID; | 813 | UUID ownerID = item.OwnerID; |
@@ -840,10 +836,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
840 | invString.AddNameValueLine("group_id", item.GroupID.ToString()); | 836 | invString.AddNameValueLine("group_id", item.GroupID.ToString()); |
841 | invString.AddSectionEnd(); | 837 | invString.AddSectionEnd(); |
842 | 838 | ||
843 | if (includeAssets) | 839 | invString.AddNameValueLine("asset_id", item.AssetID.ToString()); |
844 | invString.AddNameValueLine("asset_id", item.AssetID.ToString()); | ||
845 | else | ||
846 | invString.AddNameValueLine("asset_id", UUID.Zero.ToString()); | ||
847 | invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); | 840 | invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); |
848 | invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); | 841 | invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); |
849 | invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); | 842 | invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); |
@@ -861,8 +854,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
861 | } | 854 | } |
862 | } | 855 | } |
863 | 856 | ||
864 | int count = m_items.Count; | ||
865 | |||
866 | m_inventoryFileData = Utils.StringToBytes(invString.BuildString); | 857 | m_inventoryFileData = Utils.StringToBytes(invString.BuildString); |
867 | 858 | ||
868 | if (m_inventoryFileData.Length > 2) | 859 | if (m_inventoryFileData.Length > 2) |