diff options
| author | Melanie | 2013-04-25 21:35:18 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-25 21:37:40 +0100 |
| commit | 40036ca05f3a34ef7f0728ed52878068a66bc502 (patch) | |
| tree | fad0d46232909fd3022ff3e54d661944b472c936 /OpenSim/Region/OptionalModules/World/MoneyModule | |
| parent | Make the kicked user's avie truly disappear when it's god-kicked. (diff) | |
| download | opensim-SC-40036ca05f3a34ef7f0728ed52878068a66bc502.zip opensim-SC-40036ca05f3a34ef7f0728ed52878068a66bc502.tar.gz opensim-SC-40036ca05f3a34ef7f0728ed52878068a66bc502.tar.bz2 opensim-SC-40036ca05f3a34ef7f0728ed52878068a66bc502.tar.xz | |
Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
Sending the reply requires having the IClientAPI.
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/MoneyModule')
| -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) |