aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorBlueWall2011-11-26 17:20:20 -0500
committerBlueWall2011-11-26 17:20:20 -0500
commit19c10c892adc7168107e8866cf4d7d20b876e2a8 (patch)
tree6c6ed57160a010a17c95dbda6901f97dd845b9e4 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentAdd missing property to llGetLinkPrimitiveParams (diff)
parentWhen removing an LSL sensor for a script (e.g. through llResetScript() or sta... (diff)
downloadopensim-SC-19c10c892adc7168107e8866cf4d7d20b876e2a8.zip
opensim-SC-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.gz
opensim-SC-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.bz2
opensim-SC-19c10c892adc7168107e8866cf4d7d20b876e2a8.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index d80944b..daddb90 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -832,8 +832,8 @@ namespace OpenSim.Region.Framework.Scenes
832 invString.AddSectionEnd(); 832 invString.AddSectionEnd();
833 833
834 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 834 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
835 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); 835 invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type));
836 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); 836 invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType));
837 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); 837 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
838 838
839 invString.AddSaleStart(); 839 invString.AddSaleStart();