Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-04-29 00:38:20 +01:00
7 changed files with 81 additions and 18 deletions

View File

@@ -690,7 +690,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// <param name="agentId"></param>
public void EconomyDataRequestHandler(IClientAPI user)
{
Scene s = LocateSceneClientIn(user.AgentId);
Scene s = (Scene)user.Scene;
user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,