aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2012-12-03 19:46:16 +0100
committerMelanie2012-12-03 19:46:16 +0100
commitb7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef (patch)
treeade7248fe85aa3c1f5702aa767809dd6e95dc6c3 /OpenSim/Framework
parentMerge branch 'avination' into ubitwork (diff)
parent*TEST* diferent avatar collider (diff)
downloadopensim-SC-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.zip
opensim-SC-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.gz
opensim-SC-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.bz2
opensim-SC-b7c3a4fa7f0dd65027f360d0379ce1f633a9d6ef.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IMoneyModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 71de93a..7378d2e 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); 36 int amount, UUID txn);
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);