aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2012-01-28 01:01:23 +0000
committerMelanie2012-01-28 01:01:23 +0000
commit428407c5e409f0734ce909d5db9b1114a92cba35 (patch)
treeb1fc56efd4d8f9251811bfdb3df434534787b1c8 /OpenSim/Framework
parentMerge branch 'master' into careminster (diff)
parentRemove IClientAPI from the money module. It was only used to pass in the (diff)
downloadopensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.zip
opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.tar.gz
opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.tar.bz2
opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IMoneyModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index ea6ed4b..71de93a 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -36,8 +36,8 @@ namespace OpenSim.Framework
36 int amount); 36 int amount);
37 37
38 int GetBalance(UUID agentID); 38 int GetBalance(UUID agentID);
39 bool UploadCovered(IClientAPI client, int amount); 39 bool UploadCovered(UUID agentID, int amount);
40 bool AmountCovered(IClientAPI client, int amount); 40 bool AmountCovered(UUID agentID, int amount);
41 void ApplyCharge(UUID agentID, int amount, string text); 41 void ApplyCharge(UUID agentID, int amount, string text);
42 void ApplyUploadCharge(UUID agentID, int amount, string text); 42 void ApplyUploadCharge(UUID agentID, int amount, string text);
43 void MoveMoney(UUID fromUser, UUID toUser, int amount, string text); 43 void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);