aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-17 21:00:34 +0000
committerJustin Clarke Casey2008-11-17 21:00:34 +0000
commitc25a0ea7923aa390d30b8eebdbca4e599edf9b0d (patch)
tree775133790681153be9edc6d640162271750a1fd0 /OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
parent* minor: add interface version to 'show version' command output (diff)
downloadopensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.zip
opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.gz
opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.bz2
opensim-SC-c25a0ea7923aa390d30b8eebdbca4e599edf9b0d.tar.xz
* Update libOMV to r2359. This is necessary for the progressive texture patch
* Update libopenjpeg as well for this patch. * Appears to be okay on a very short sniff test * Source code will be placed in opensim-libs shortly
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 073bccf..4209e4a 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -562,11 +562,11 @@ namespace OpenSim.Region.Environment.Scenes
562 562
563 invString.AddPermissionsStart(); 563 invString.AddPermissionsStart();
564 564
565 invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(baseMask)); 565 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
566 invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(ownerMask)); 566 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
567 invString.AddNameValueLine("group_mask", Helpers.UIntToHexString(0)); 567 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0));
568 invString.AddNameValueLine("everyone_mask", Helpers.UIntToHexString(everyoneMask)); 568 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
569 invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextPermissions)); 569 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
570 570
571 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 571 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
572 invString.AddNameValueLine("owner_id", ownerID.ToString()); 572 invString.AddNameValueLine("owner_id", ownerID.ToString());
@@ -579,7 +579,7 @@ namespace OpenSim.Region.Environment.Scenes
579 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 579 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
580 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); 580 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
581 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); 581 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
582 invString.AddNameValueLine("flags", Helpers.UIntToHexString(item.Flags)); 582 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
583 583
584 invString.AddSaleStart(); 584 invString.AddSaleStart();
585 invString.AddNameValueLine("sale_type", "not"); 585 invString.AddNameValueLine("sale_type", "not");