diff options
| author | Melanie | 2013-04-25 21:37:25 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-25 21:37:25 +0100 |
| commit | fb8aa220845c13872dbeae58efc6183ded7f7f52 (patch) | |
| tree | fdc05e151953f1261cb9f66421edc7a4dc8bb46b /OpenSim/Region/OptionalModules/World/MoneyModule | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th... (diff) | |
| download | opensim-SC-fb8aa220845c13872dbeae58efc6183ded7f7f52.zip opensim-SC-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.gz opensim-SC-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.bz2 opensim-SC-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 57d9217..be020e4 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
| @@ -688,19 +688,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
| 688 | /// Event called Economy Data Request handler. | 688 | /// Event called Economy Data Request handler. |
| 689 | /// </summary> | 689 | /// </summary> |
| 690 | /// <param name="agentId"></param> | 690 | /// <param name="agentId"></param> |
| 691 | public void EconomyDataRequestHandler(UUID agentId) | 691 | public void EconomyDataRequestHandler(IClientAPI user) |
| 692 | { | 692 | { |
| 693 | IClientAPI user = LocateClientObject(agentId); | 693 | Scene s = LocateSceneClientIn(user.AgentId); |
| 694 | 694 | ||
| 695 | if (user != null) | 695 | user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate, |
| 696 | { | 696 | PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor, |
| 697 | Scene s = LocateSceneClientIn(user.AgentId); | 697 | PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload, |
| 698 | 698 | TeleportMinPrice, TeleportPriceExponent); | |
| 699 | user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate, | ||
| 700 | PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor, | ||
| 701 | PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload, | ||
| 702 | TeleportMinPrice, TeleportPriceExponent); | ||
| 703 | } | ||
| 704 | } | 699 | } |
| 705 | 700 | ||
| 706 | private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e) | 701 | private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e) |