From b01020b84a1ec6aea29732fd2d930522d1348213 Mon Sep 17 00:00:00 2001 From: Melanie Date: Sat, 2 Oct 2010 18:45:48 +0100 Subject: Revert "Forward-port 0.6 fix" This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1. --- .../CoreModules/World/Objects/BuySell/BuySellModule.cs | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index a674d60..c8fb9da 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs @@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell part.GetProperties(client); } - public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice) + public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType) { SceneObjectPart part = m_scene.GetSceneObjectPart(localID); @@ -114,18 +114,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell 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; switch (saleType) -- cgit v1.1