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/Framework | |
| 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/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IBuySellModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs b/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs index 0132bae..d1ce4c0 100644 --- a/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IBuySellModule.cs | |||
| @@ -42,6 +42,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 42 | /// <returns> | 42 | /// <returns> |
| 43 | /// True on a successful purchase, false on failure | 43 | /// True on a successful purchase, false on failure |
| 44 | /// </returns> | 44 | /// </returns> |
| 45 | bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType); | 45 | bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice); |
| 46 | } | 46 | } |
| 47 | } \ No newline at end of file | 47 | } |