diff options
| author | Melanie | 2010-10-02 18:47:26 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-02 18:47:26 +0100 |
| commit | 87c63868840705e479c9c11123e27ce191c38619 (patch) | |
| tree | 18a11f6f526ed31de0d317581fe9178f12ea0cbc /OpenSim/Region/CoreModules | |
| parent | Revert "Forward-port 0.6 fix" (diff) | |
| download | opensim-SC-87c63868840705e479c9c11123e27ce191c38619.zip opensim-SC-87c63868840705e479c9c11123e27ce191c38619.tar.gz opensim-SC-87c63868840705e479c9c11123e27ce191c38619.tar.bz2 opensim-SC-87c63868840705e479c9c11123e27ce191c38619.tar.xz | |
Reapplying the parts of the prior revert that were not derived from the
original patch
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index c8fb9da..c06ccb2 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 | |||
| 104 | part.GetProperties(client); | 104 | part.GetProperties(client); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType) | 107 | public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice) |
| 108 | { | 108 | { |
| 109 | SceneObjectPart part = m_scene.GetSceneObjectPart(localID); | 109 | SceneObjectPart part = m_scene.GetSceneObjectPart(localID); |
| 110 | 110 | ||