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

Revert "Forward-port 0.6 fix" 

This reverts commit 90b51dc7d6.
viewer-2-initial-appearance
Melanie 2010-10-02 18:45:48 +01:00
parent f220a2c5eb
commit b01020b84a
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
View File

@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
part.GetProperties(client); 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); SceneObjectPart part = m_scene.GetSceneObjectPart(localID);
@ -114,18 +114,6 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
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)

4
OpenSim/Region/Framework/Interfaces/IBuySellModule.cs
View File

@ -42,6 +42,6 @@ namespace OpenSim.Region.Framework.Interfaces
/// <returns> /// <returns>
/// True on a successful purchase, false on failure /// True on a successful purchase, false on failure
/// </returns> /// </returns>
bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice); bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType);
} }
} }

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

@ -814,7 +814,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
IBuySellModule module = s.RequestModuleInterface<IBuySellModule>(); IBuySellModule module = s.RequestModuleInterface<IBuySellModule>();
if (module != null) if (module != null)
module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); module.BuyObject(remoteClient, categoryID, localID, saleType);
} }
} }
@ -825,4 +825,4 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
Gift = 2, Gift = 2,
Purchase = 3 Purchase = 3
} }
} }