aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2013-04-25 21:35:18 +0100
committerMelanie2013-04-25 21:35:18 +0100
commit03c9d8ae4fa9a47cda66814177071c258f5b4437 (patch)
tree251cada34803e34121b3d45eeaeb95d46206d13c /OpenSim/Region
parentChange copyright notice on DynamicMenuModule to proper BSD (diff)
downloadopensim-SC_OLD-03c9d8ae4fa9a47cda66814177071c258f5b4437.zip
opensim-SC_OLD-03c9d8ae4fa9a47cda66814177071c258f5b4437.tar.gz
opensim-SC_OLD-03c9d8ae4fa9a47cda66814177071c258f5b4437.tar.bz2
opensim-SC_OLD-03c9d8ae4fa9a47cda66814177071c258f5b4437.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')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs17
2 files changed, 7 insertions, 12 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 1eb953c..bede379 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -9682,7 +9682,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9682 EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest; 9682 EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest;
9683 if (handlerEconomoyDataRequest != null) 9683 if (handlerEconomoyDataRequest != null)
9684 { 9684 {
9685 handlerEconomoyDataRequest(AgentId); 9685 handlerEconomoyDataRequest(this);
9686 } 9686 }
9687 return true; 9687 return true;
9688 } 9688 }
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 7bbf500..37af8c7 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)