diff options
author | Melanie | 2011-01-12 21:46:49 +0000 |
---|---|---|
committer | Melanie | 2011-01-12 21:46:49 +0000 |
commit | 705f4e1e4be44e6b96d028b3445681145a0c4d8f (patch) | |
tree | 9ae160fab19292fe50e48fc2ad2c8c35ddcd5dbb /OpenSim | |
parent | Fix direct item give permissions (diff) | |
download | opensim-SC-705f4e1e4be44e6b96d028b3445681145a0c4d8f.zip opensim-SC-705f4e1e4be44e6b96d028b3445681145a0c4d8f.tar.gz opensim-SC-705f4e1e4be44e6b96d028b3445681145a0c4d8f.tar.bz2 opensim-SC-705f4e1e4be44e6b96d028b3445681145a0c4d8f.tar.xz |
Dont' trust the viewer! Fix a permission slam error caused by trusting
the viewer too much.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index f2cc16c..7bb8789 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -637,6 +637,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
637 | rootPart.Name = item.Name; | 637 | rootPart.Name = item.Name; |
638 | rootPart.Description = item.Description; | 638 | rootPart.Description = item.Description; |
639 | 639 | ||
640 | if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0) | ||
641 | { | ||
642 | rootPart.ObjectSaleType = item.SaleType; | ||
643 | rootPart.SalePrice = item.SalePrice; | ||
644 | } | ||
645 | |||
640 | group.SetGroup(remoteClient.ActiveGroupId, remoteClient); | 646 | group.SetGroup(remoteClient.ActiveGroupId, remoteClient); |
641 | if ((rootPart.OwnerID != item.Owner) || | 647 | if ((rootPart.OwnerID != item.Owner) || |
642 | (item.CurrentPermissions & 16) != 0 || // Magic number | 648 | (item.CurrentPermissions & 16) != 0 || // Magic number |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 19fa6c5..e2d96d9 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -326,7 +326,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
326 | { | 326 | { |
327 | if (UUID.Zero == transactionID) | 327 | if (UUID.Zero == transactionID) |
328 | { | 328 | { |
329 | item.Flags = itemUpd.Flags; | ||
330 | item.Name = itemUpd.Name; | 329 | item.Name = itemUpd.Name; |
331 | item.Description = itemUpd.Description; | 330 | item.Description = itemUpd.Description; |
332 | if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) | 331 | if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) |