aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2009-01-26 20:05:13 +0000
committerTeravus Ovares2009-01-26 20:05:13 +0000
commitfc75a2031ee557c0e4154aa066e20b773ac72dda (patch)
tree3c8d8131f3560d902db5c5894208f3e306a2298c
parentin the spirit of cleanup, remove the old sql directory, as this stuff is (diff)
downloadopensim-SC-fc75a2031ee557c0e4154aa066e20b773ac72dda.zip
opensim-SC-fc75a2031ee557c0e4154aa066e20b773ac72dda.tar.gz
opensim-SC-fc75a2031ee557c0e4154aa066e20b773ac72dda.tar.bz2
opensim-SC-fc75a2031ee557c0e4154aa066e20b773ac72dda.tar.xz
* Providing a way for the rest of the simulator to get at the economy settings through the IMoneyModule interface.
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs23
-rw-r--r--OpenSim/Region/Interfaces/IMoneyModule.cs21
2 files changed, 44 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index a1940ae..07e62e2 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -279,6 +279,27 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
279 scene.SetObjectCapacity(ObjectCapacity); 279 scene.SetObjectCapacity(ObjectCapacity);
280 } 280 }
281 281
282 public EconomyData GetEconomyData()
283 {
284 EconomyData edata = new EconomyData();
285 edata.ObjectCapacity = ObjectCapacity;
286 edata.ObjectCount = ObjectCount;
287 edata.PriceEnergyUnit = PriceEnergyUnit;
288 edata.PriceGroupCreate = PriceGroupCreate;
289 edata.PriceObjectClaim = PriceObjectClaim;
290 edata.PriceObjectRent = PriceObjectRent;
291 edata.PriceObjectScaleFactor = PriceObjectScaleFactor;
292 edata.PriceParcelClaim = PriceParcelClaim;
293 edata.PriceParcelClaimFactor = PriceParcelClaimFactor;
294 edata.PriceParcelRent = PriceParcelRent;
295 edata.PricePublicObjectDecay = PricePublicObjectDecay;
296 edata.PricePublicObjectDelete = PricePublicObjectDelete;
297 edata.PriceRentLight = PriceRentLight;
298 edata.PriceUpload = PriceUpload;
299 edata.TeleportMinPrice = TeleportMinPrice;
300 return edata;
301 }
302
282 private void GetClientFunds(IClientAPI client) 303 private void GetClientFunds(IClientAPI client)
283 { 304 {
284 // Here we check if we're in grid mode 305 // Here we check if we're in grid mode
@@ -1580,4 +1601,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
1580 Gift = 2, 1601 Gift = 2,
1581 Purchase = 3 1602 Purchase = 3
1582 } 1603 }
1604
1605
1583} 1606}
diff --git a/OpenSim/Region/Interfaces/IMoneyModule.cs b/OpenSim/Region/Interfaces/IMoneyModule.cs
index 1fa4f13..5dfb64c 100644
--- a/OpenSim/Region/Interfaces/IMoneyModule.cs
+++ b/OpenSim/Region/Interfaces/IMoneyModule.cs
@@ -45,6 +45,27 @@ namespace OpenSim.Region.Interfaces
45 bool AmountCovered(IClientAPI client, int amount); 45 bool AmountCovered(IClientAPI client, int amount);
46 void ApplyCharge(UUID agentID, int amount, string text); 46 void ApplyCharge(UUID agentID, int amount, string text);
47 47
48 EconomyData GetEconomyData();
49
48 event ObjectPaid OnObjectPaid; 50 event ObjectPaid OnObjectPaid;
49 } 51 }
52
53 public struct EconomyData
54 {
55 public int ObjectCapacity;
56 public int ObjectCount;
57 public int PriceEnergyUnit;
58 public int PriceGroupCreate;
59 public int PriceObjectClaim;
60 public float PriceObjectRent;
61 public float PriceObjectScaleFactor;
62 public int PriceParcelClaim;
63 public float PriceParcelClaimFactor;
64 public int PriceParcelRent;
65 public int PricePublicObjectDecay;
66 public int PricePublicObjectDelete;
67 public int PriceRentLight;
68 public int PriceUpload;
69 public int TeleportMinPrice;
70 }
50} 71}