aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2010-07-02 04:51:31 +0200
committerMelanie2010-07-02 04:45:03 +0100
commitfda9d7b75e88f8308f5a05ae8f5476869e675a0b (patch)
tree935e4784c9df3df93ee52629573a4dc6c2942072 /OpenSim
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-fda9d7b75e88f8308f5a05ae8f5476869e675a0b.zip
opensim-SC-fda9d7b75e88f8308f5a05ae8f5476869e675a0b.tar.gz
opensim-SC-fda9d7b75e88f8308f5a05ae8f5476869e675a0b.tar.bz2
opensim-SC-fda9d7b75e88f8308f5a05ae8f5476869e675a0b.tar.xz
Remove GetEconomyData and the economy data structure (unused)
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IMoneyModule.cs21
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs21
2 files changed, 0 insertions, 42 deletions
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
43 bool AmountCovered(IClientAPI client, int amount); 43 bool AmountCovered(IClientAPI client, int amount);
44 void ApplyCharge(UUID agentID, int amount, string text); 44 void ApplyCharge(UUID agentID, int amount, string text);
45 45
46 EconomyData GetEconomyData();
47
48 event ObjectPaid OnObjectPaid; 46 event ObjectPaid OnObjectPaid;
49 } 47 }
50
51 public struct EconomyData
52 {
53 public int ObjectCapacity;
54 public int ObjectCount;
55 public int PriceEnergyUnit;
56 public int PriceGroupCreate;
57 public int PriceObjectClaim;
58 public float PriceObjectRent;
59 public float PriceObjectScaleFactor;
60 public int PriceParcelClaim;
61 public float PriceParcelClaimFactor;
62 public int PriceParcelRent;
63 public int PricePublicObjectDecay;
64 public int PricePublicObjectDelete;
65 public int PriceRentLight;
66 public int PriceUpload;
67 public int TeleportMinPrice;
68 }
69} 48}
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index b9a75cc..e070077 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -268,27 +268,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
268 268
269 } 269 }
270 270
271 public EconomyData GetEconomyData()
272 {
273 EconomyData edata = new EconomyData();
274 edata.ObjectCapacity = ObjectCapacity;
275 edata.ObjectCount = ObjectCount;
276 edata.PriceEnergyUnit = PriceEnergyUnit;
277 edata.PriceGroupCreate = PriceGroupCreate;
278 edata.PriceObjectClaim = PriceObjectClaim;
279 edata.PriceObjectRent = PriceObjectRent;
280 edata.PriceObjectScaleFactor = PriceObjectScaleFactor;
281 edata.PriceParcelClaim = PriceParcelClaim;
282 edata.PriceParcelClaimFactor = PriceParcelClaimFactor;
283 edata.PriceParcelRent = PriceParcelRent;
284 edata.PricePublicObjectDecay = PricePublicObjectDecay;
285 edata.PricePublicObjectDelete = PricePublicObjectDelete;
286 edata.PriceRentLight = PriceRentLight;
287 edata.PriceUpload = PriceUpload;
288 edata.TeleportMinPrice = TeleportMinPrice;
289 return edata;
290 }
291
292 private void GetClientFunds(IClientAPI client) 271 private void GetClientFunds(IClientAPI client)
293 { 272 {
294 CheckExistAndRefreshFunds(client.AgentId); 273 CheckExistAndRefreshFunds(client.AgentId);