diff options
author | Melanie | 2013-04-25 21:37:25 +0100 |
---|---|---|
committer | Melanie | 2013-04-25 21:37:25 +0100 |
commit | fb8aa220845c13872dbeae58efc6183ded7f7f52 (patch) | |
tree | fdc05e151953f1261cb9f66421edc7a4dc8bb46b /OpenSim | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th... (diff) | |
download | opensim-SC-fb8aa220845c13872dbeae58efc6183ded7f7f52.zip opensim-SC-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.gz opensim-SC-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.bz2 opensim-SC-fb8aa220845c13872dbeae58efc6183ded7f7f52.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 17 |
3 files changed, 8 insertions, 13 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 655ba8a..c88828b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -320,7 +320,7 @@ namespace OpenSim.Framework | |||
320 | public delegate void ObjectPermissions( | 320 | public delegate void ObjectPermissions( |
321 | IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set); | 321 | IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set); |
322 | 322 | ||
323 | public delegate void EconomyDataRequest(UUID agentID); | 323 | public delegate void EconomyDataRequest(IClientAPI client); |
324 | 324 | ||
325 | public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); | 325 | public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); |
326 | 326 | ||
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index b7469ae..800488d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -9863,7 +9863,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9863 | EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest; | 9863 | EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest; |
9864 | if (handlerEconomoyDataRequest != null) | 9864 | if (handlerEconomoyDataRequest != null) |
9865 | { | 9865 | { |
9866 | handlerEconomoyDataRequest(AgentId); | 9866 | handlerEconomoyDataRequest(this); |
9867 | } | 9867 | } |
9868 | return true; | 9868 | return true; |
9869 | } | 9869 | } |
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 57d9217..be020e4 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) |