diff options
| author | Melanie | 2010-09-30 16:01:45 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-30 16:01:45 +0100 |
| commit | 521e2c83558d77c0482bebb6764a22c1fb8c5fd9 (patch) | |
| tree | b58fdcab0d9ac8c9056413f005144384da1686a3 /OpenSim/Region/OptionalModules | |
| parent | Fix an inventory fetch issue (diff) | |
| parent | Prevent dropping someone else's attachments (diff) | |
| download | opensim-SC_OLD-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.zip opensim-SC_OLD-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.gz opensim-SC_OLD-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.bz2 opensim-SC_OLD-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 | } |