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

Reapplying the parts of the prior revert that were not derived from the 

original patch
viewer-2-initial-appearance
Melanie 2010-10-02 18:47:26 +01:00
parent b01020b84a
commit 87c6386884
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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) public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice)
{ {
SceneObjectPart part = m_scene.GetSceneObjectPart(localID); SceneObjectPart part = m_scene.GetSceneObjectPart(localID);

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); bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice);
} }
} }

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); module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice);
} }
} }
@ -825,4 +825,4 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
Gift = 2, Gift = 2,
Purchase = 3 Purchase = 3
} }
} }