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/OptionalModules | |
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/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index cc51c3b..d364df6 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
@@ -814,7 +814,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
814 | 814 | ||
815 | IBuySellModule module = s.RequestModuleInterface<IBuySellModule>(); | 815 | IBuySellModule module = s.RequestModuleInterface<IBuySellModule>(); |
816 | if (module != null) | 816 | if (module != null) |
817 | module.BuyObject(remoteClient, categoryID, localID, saleType); | 817 | module.BuyObject(remoteClient, categoryID, localID, saleType, salePrice); |
818 | } | 818 | } |
819 | } | 819 | } |
820 | 820 | ||
@@ -825,4 +825,4 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
825 | Gift = 2, | 825 | Gift = 2, |
826 | Purchase = 3 | 826 | Purchase = 3 |
827 | } | 827 | } |
828 | } \ No newline at end of file | 828 | } |