diff options
author | Melanie | 2011-11-28 11:06:38 +0000 |
---|---|---|
committer | Melanie | 2011-11-28 11:06:38 +0000 |
commit | dc612d0f08ff8740c1942270f22eb79f0310c8fd (patch) | |
tree | 4c621d499eecbc176c6eb28a4bad4f8f4872e7f5 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.zip opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.gz opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.bz2 opensim-SC-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.xz |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index c485e87..2335ad5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -1085,8 +1085,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1085 | invString.AddNameValueLine("asset_id", item.AssetID.ToString()); | 1085 | invString.AddNameValueLine("asset_id", item.AssetID.ToString()); |
1086 | else | 1086 | else |
1087 | invString.AddNameValueLine("asset_id", UUID.Zero.ToString()); | 1087 | invString.AddNameValueLine("asset_id", UUID.Zero.ToString()); |
1088 | invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); | 1088 | invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type)); |
1089 | invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); | 1089 | invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType)); |
1090 | invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); | 1090 | invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); |
1091 | 1091 | ||
1092 | invString.AddSaleStart(); | 1092 | invString.AddSaleStart(); |