diff options
| author | Melanie | 2013-04-29 00:38:20 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-29 00:38:20 +0100 |
| commit | 7c729e1519add75bd11b998b5d1709d351d82d29 (patch) | |
| tree | 1069522b2d63041966d9b66b399fa94597a38d51 /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix wrong sql statement in offline im. (diff) | |
| download | opensim-SC-7c729e1519add75bd11b998b5d1709d351d82d29.zip opensim-SC-7c729e1519add75bd11b998b5d1709d351d82d29.tar.gz opensim-SC-7c729e1519add75bd11b998b5d1709d351d82d29.tar.bz2 opensim-SC-7c729e1519add75bd11b998b5d1709d351d82d29.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index be020e4..17d1591 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
| @@ -690,7 +690,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
| 690 | /// <param name="agentId"></param> | 690 | /// <param name="agentId"></param> |
| 691 | public void EconomyDataRequestHandler(IClientAPI user) | 691 | public void EconomyDataRequestHandler(IClientAPI user) |
| 692 | { | 692 | { |
| 693 | Scene s = LocateSceneClientIn(user.AgentId); | 693 | Scene s = (Scene)user.Scene; |
| 694 | 694 | ||
| 695 | user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate, | 695 | user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate, |
| 696 | PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor, | 696 | PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor, |