From 3234472d6203671a492a73042a0b56d6301903e0 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 19 Nov 2008 06:15:21 +0000
Subject: Reverting the texture sending patch and the new libOMV. This makes
 this release a direct descendant of the stable 7364, with all the features
 and none of the issues. This omits the following patch chain: r7383 r7382
 r7381 r7377 r7375 r7373 r7372 r7370 r7369 r7368 r7367 r7366

---
 .../Region/Environment/Scenes/SceneObjectPart.Inventory.cs   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index ba638e5..1309e77 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -584,11 +584,11 @@ namespace OpenSim.Region.Environment.Scenes
 
                     invString.AddPermissionsStart();
 
-                    invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
-                    invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
-                    invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0));
-                    invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
-                    invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
+                    invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(baseMask));
+                    invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(ownerMask));
+                    invString.AddNameValueLine("group_mask", Helpers.UIntToHexString(0));
+                    invString.AddNameValueLine("everyone_mask", Helpers.UIntToHexString(everyoneMask));
+                    invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextPermissions));
 
                     invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
                     invString.AddNameValueLine("owner_id", ownerID.ToString());
@@ -601,7 +601,7 @@ namespace OpenSim.Region.Environment.Scenes
                     invString.AddNameValueLine("asset_id", item.AssetID.ToString());
                     invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
                     invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
-                    invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
+                    invString.AddNameValueLine("flags", Helpers.UIntToHexString(item.Flags));
 
                     invString.AddSaleStart();
                     invString.AddNameValueLine("sale_type", "not");
-- 
cgit v1.1