aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2010-07-02 06:20:36 +0200
committerMelanie2010-07-02 06:13:58 +0100
commite15f6905a53d686e3de9c2e16e842f3b735c3685 (patch)
tree414400c1ec6dc391afe69ff3b2344de6e7cd12ff /OpenSim/Framework
parentRemove GetEconomyData and the economy data structure (unused) (diff)
downloadopensim-SC_OLD-e15f6905a53d686e3de9c2e16e842f3b735c3685.zip
opensim-SC_OLD-e15f6905a53d686e3de9c2e16e842f3b735c3685.tar.gz
opensim-SC_OLD-e15f6905a53d686e3de9c2e16e842f3b735c3685.tar.bz2
opensim-SC_OLD-e15f6905a53d686e3de9c2e16e842f3b735c3685.tar.xz
Clean up IMoneyModule and adjust the other modules to the changes
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/IMoneyModule.cs11
2 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 62a1e17..da953bb 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -814,7 +814,7 @@ namespace OpenSim.Framework.Capabilities
814 814
815 if (mm != null) 815 if (mm != null)
816 { 816 {
817 if (!mm.UploadCovered(client)) 817 if (!mm.UploadCovered(client, mm.UploadCharge))
818 { 818 {
819 if (client != null) 819 if (client != null)
820 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); 820 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 17e74a0..3d4873d 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -35,13 +35,14 @@ namespace OpenSim.Framework
35 bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, 35 bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
36 int amount); 36 int amount);
37 37
38 int GetBalance(IClientAPI client); 38 int GetBalance(UUID agentID);
39 void ApplyUploadCharge(UUID agentID); 39 bool UploadCovered(IClientAPI client, int amount);
40 bool UploadCovered(IClientAPI client);
41 void ApplyGroupCreationCharge(UUID agentID);
42 bool GroupCreationCovered(IClientAPI client);
43 bool AmountCovered(IClientAPI client, int amount); 40 bool AmountCovered(IClientAPI client, int amount);
44 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);
43
44 int UploadCharge { get; }
45 int GroupCreationCharge { get; }
45 46
46 event ObjectPaid OnObjectPaid; 47 event ObjectPaid OnObjectPaid;
47 } 48 }