From e619aceebcbd1f9aff314da864d098074f1bf7ef Mon Sep 17 00:00:00 2001 From: Melanie Date: Sat, 2 Oct 2010 18:42:04 +0100 Subject: [PATCH] Revert "Fix a sale issue" This reverts commit 76fd4cf7b58cd690d75c4094b15e12d439f5849a. Original contributor is unable to accept contributor agreement. --- OpenSim/Region/Framework/Scenes/Scene.cs | 15 +-------------- .../World/MoneyModule/SampleMoneyModule.cs | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0e5f81fce7..ea93bdeab7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -4616,7 +4616,7 @@ namespace OpenSim.Region.Framework.Scenes } public bool PerformObjectBuy(IClientAPI remoteClient, UUID categoryID, - uint localID, byte saleType, int salePrice) + uint localID, byte saleType) { SceneObjectPart part = GetSceneObjectPart(localID); @@ -4625,19 +4625,6 @@ namespace OpenSim.Region.Framework.Scenes if (part.ParentGroup == null) return false; - - if (part.ObjectSaleType != saleType) - { - m_dialogModule.SendAlertToUser(remoteClient, "This item is not available for the type of sale specified"); - return false; - } - - if (part.SalePrice != salePrice) - { - m_dialogModule.SendAlertToUser(remoteClient, "This item is not available for the price specified"); - return false; - } - SceneObjectGroup group = part.ParentGroup; diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 1111519211..3160cd3324 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs @@ -850,7 +850,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false); return; } - s.PerformObjectBuy(remoteClient, categoryID, localID, saleType, salePrice); + s.PerformObjectBuy(remoteClient, categoryID, localID, saleType); } }