From 03c9d8ae4fa9a47cda66814177071c258f5b4437 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 25 Apr 2013 21:35:18 +0100
Subject: 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.
---
.../World/MoneyModule/SampleMoneyModule.cs | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs')
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
/// Event called Economy Data Request handler.
///
///
- public void EconomyDataRequestHandler(UUID agentId)
+ public void EconomyDataRequestHandler(IClientAPI user)
{
- IClientAPI user = LocateClientObject(agentId);
+ Scene s = LocateSceneClientIn(user.AgentId);
- if (user != null)
- {
- Scene s = LocateSceneClientIn(user.AgentId);
-
- user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
- PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
- PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
- TeleportMinPrice, TeleportPriceExponent);
- }
+ user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
+ PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
+ PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
+ TeleportMinPrice, TeleportPriceExponent);
}
private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e)
--
cgit v1.1
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/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs')
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
///
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/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs')
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
///
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
From 533bbf033df88fd231eb0e7d2b0aa5a0058163ea Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 25 May 2013 02:08:54 +0100
Subject: Update the money framework to allow sending the new style linden
"serverside is now viewerside" messages regarding currency This will require
all money modules to be refactored!
---
.../OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs')
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 35f44d0..1345db9 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -191,9 +191,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
// Please do not refactor these to be just one method
// Existing implementations need the distinction
//
- public void ApplyCharge(UUID agentID, int amount, string text)
+ public void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData)
{
}
+
+ public void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type)
+ {
+ }
+
public void ApplyUploadCharge(UUID agentID, int amount, string text)
{
}
@@ -322,7 +327,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
client.SendAlertMessage(e.Message + " ");
}
- client.SendMoneyBalance(TransactionID, true, new byte[0], returnfunds);
+ client.SendMoneyBalance(TransactionID, true, new byte[0], returnfunds, 0, UUID.Zero, false, UUID.Zero, false, 0, String.Empty);
}
else
{
@@ -385,12 +390,12 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
{
if (sender != null)
{
- sender.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(description), GetFundsForAgentID(senderID));
+ sender.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(description), GetFundsForAgentID(senderID), 0, UUID.Zero, false, UUID.Zero, false, 0, String.Empty);
}
if (receiver != null)
{
- receiver.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(description), GetFundsForAgentID(receiverID));
+ receiver.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(description), GetFundsForAgentID(receiverID), 0, UUID.Zero, false, UUID.Zero, false, 0, String.Empty);
}
}
}
--
cgit v1.1