OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix a sale issue" 

This reverts commit 76fd4cf7b5.

Original contributor is unable to accept contributor agreement.
0.6.9-post-fixes
Melanie 2010-10-02 18:42:04 +01:00
parent 76fd4cf7b5
commit e619aceebc
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -4616,7 +4616,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
public bool PerformObjectBuy(IClientAPI remoteClient, UUID categoryID, public bool PerformObjectBuy(IClientAPI remoteClient, UUID categoryID,
uint localID, byte saleType, int salePrice) uint localID, byte saleType)
{ {
SceneObjectPart part = GetSceneObjectPart(localID); SceneObjectPart part = GetSceneObjectPart(localID);
@ -4626,19 +4626,6 @@ namespace OpenSim.Region.Framework.Scenes
if (part.ParentGroup == null) if (part.ParentGroup == null)
return false; 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; SceneObjectGroup group = part.ParentGroup;
switch (saleType) switch (saleType)

2
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
View File

@ -850,7 +850,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false); remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false);
return; return;
} }
s.PerformObjectBuy(remoteClient, categoryID, localID, saleType, salePrice); s.PerformObjectBuy(remoteClient, categoryID, localID, saleType);
} }
} }