diff options
| author | Diva Canto | 2013-04-27 21:24:07 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-04-27 21:24:07 -0700 |
| commit | a49c5291dc89679400574b1316c495bbd797b7a1 (patch) | |
| tree | 01b343f0d54eb865c575009c95b168ffb1ade8f2 /OpenSim/Region | |
| parent | Added an interface to an external ban service. With this commit, the interfac... (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-a49c5291dc89679400574b1316c495bbd797b7a1.zip opensim-SC-a49c5291dc89679400574b1316c495bbd797b7a1.tar.gz opensim-SC-a49c5291dc89679400574b1316c495bbd797b7a1.tar.bz2 opensim-SC-a49c5291dc89679400574b1316c495bbd797b7a1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 37af8c7..35f44d0 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, |