diff options
author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |
parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
download | opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz |
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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 12 |
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 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 | |||
584 | 584 | ||
585 | invString.AddPermissionsStart(); | 585 | invString.AddPermissionsStart(); |
586 | 586 | ||
587 | invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask)); | 587 | invString.AddNameValueLine("base_mask", Helpers.UIntToHexString(baseMask)); |
588 | invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask)); | 588 | invString.AddNameValueLine("owner_mask", Helpers.UIntToHexString(ownerMask)); |
589 | invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0)); | 589 | invString.AddNameValueLine("group_mask", Helpers.UIntToHexString(0)); |
590 | invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask)); | 590 | invString.AddNameValueLine("everyone_mask", Helpers.UIntToHexString(everyoneMask)); |
591 | invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions)); | 591 | invString.AddNameValueLine("next_owner_mask", Helpers.UIntToHexString(item.NextPermissions)); |
592 | 592 | ||
593 | invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); | 593 | invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); |
594 | invString.AddNameValueLine("owner_id", ownerID.ToString()); | 594 | invString.AddNameValueLine("owner_id", ownerID.ToString()); |
@@ -601,7 +601,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
601 | invString.AddNameValueLine("asset_id", item.AssetID.ToString()); | 601 | invString.AddNameValueLine("asset_id", item.AssetID.ToString()); |
602 | invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); | 602 | invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); |
603 | invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); | 603 | invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); |
604 | invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); | 604 | invString.AddNameValueLine("flags", Helpers.UIntToHexString(item.Flags)); |
605 | 605 | ||
606 | invString.AddSaleStart(); | 606 | invString.AddSaleStart(); |
607 | invString.AddNameValueLine("sale_type", "not"); | 607 | invString.AddNameValueLine("sale_type", "not"); |