From fda9d7b75e88f8308f5a05ae8f5476869e675a0b Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 2 Jul 2010 04:51:31 +0200
Subject: Remove GetEconomyData and the economy data structure (unused)

---
 OpenSim/Framework/IMoneyModule.cs | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'OpenSim/Framework/IMoneyModule.cs')

diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 3480960..17e74a0 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -43,27 +43,6 @@ namespace OpenSim.Framework
         bool AmountCovered(IClientAPI client, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
 
-        EconomyData GetEconomyData();
-
         event ObjectPaid OnObjectPaid;
     }
-
-    public struct EconomyData
-    {
-        public int ObjectCapacity;
-        public int ObjectCount;
-        public int PriceEnergyUnit;
-        public int PriceGroupCreate;
-        public int PriceObjectClaim;
-        public float PriceObjectRent;
-        public float PriceObjectScaleFactor;
-        public int PriceParcelClaim;
-        public float PriceParcelClaimFactor;
-        public int PriceParcelRent;
-        public int PricePublicObjectDecay;
-        public int PricePublicObjectDelete;
-        public int PriceRentLight;
-        public int PriceUpload;
-        public int TeleportMinPrice;
-    }
 }
-- 
cgit v1.1


From e15f6905a53d686e3de9c2e16e842f3b735c3685 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 2 Jul 2010 06:20:36 +0200
Subject: Clean up IMoneyModule and adjust the other modules to the changes

---
 OpenSim/Framework/IMoneyModule.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework/IMoneyModule.cs')

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
         bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
                 int amount);
 
-        int GetBalance(IClientAPI client);
-        void ApplyUploadCharge(UUID agentID);
-        bool UploadCovered(IClientAPI client);
-        void ApplyGroupCreationCharge(UUID agentID);
-        bool GroupCreationCovered(IClientAPI client);
+        int GetBalance(UUID agentID);
+        bool UploadCovered(IClientAPI client, int amount);
         bool AmountCovered(IClientAPI client, int amount);
         void ApplyCharge(UUID agentID, int amount, string text);
+        void ApplyUploadCharge(UUID agentID, int amount, string text);
+
+        int UploadCharge { get; }
+        int GroupCreationCharge { get; }
 
         event ObjectPaid OnObjectPaid;
     }
-- 
cgit v1.1