From ef08ab68a7a8870e4ec300a0da5533ea097a9577 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 27 Apr 2013 17:42:54 +0100
Subject: Small oversight in EconomyDataRequest - this would have affected
 everyone NOT using a money module.

---
 OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 37af8c7..5863379 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -690,8 +690,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="agentId"></param>
         public void EconomyDataRequestHandler(IClientAPI user)
         {
-            Scene s = LocateSceneClientIn(user.AgentId);
-
             user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
                                  PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
                                  PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
-- 
cgit v1.1


From cbb3bb62dae548917a899171bd69972e85a1642d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 27 Apr 2013 17:56:39 +0100
Subject: Unbreak the sample money module

---
 OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 5863379..35f44d0 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -690,6 +690,8 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="agentId"></param>
         public void EconomyDataRequestHandler(IClientAPI user)
         {
+            Scene s = (Scene)user.Scene;
+
             user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
                                  PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
                                  PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
-- 
cgit v1.1