diff options
| author | Melanie | 2013-06-23 01:48:57 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:48:57 +0100 |
| commit | 24a4367fc2ff9456ec165db14a646dba977550a0 (patch) | |
| tree | f6880151d7b5e4749685dc4f4cc5d1130a9544e7 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix prim locking to behave like SL (diff) | |
| download | opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.zip opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.gz opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.bz2 opensim-SC_OLD-24a4367fc2ff9456ec165db14a646dba977550a0.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IMoneyModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs index 415b7df..55c9613 100644 --- a/OpenSim/Framework/IMoneyModule.cs +++ b/OpenSim/Framework/IMoneyModule.cs | |||
| @@ -33,7 +33,7 @@ namespace OpenSim.Framework | |||
| 33 | public interface IMoneyModule | 33 | public interface IMoneyModule |
| 34 | { | 34 | { |
| 35 | bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, | 35 | bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, |
| 36 | int amount, UUID txn); | 36 | int amount, UUID txn, out string reason); |
| 37 | 37 | ||
| 38 | int GetBalance(UUID agentID); | 38 | int GetBalance(UUID agentID); |
| 39 | bool UploadCovered(UUID agentID, int amount); | 39 | bool UploadCovered(UUID agentID, int amount); |