OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SampleMoneyModule: suport viewers new opensimextra currency-base-uri sim feature override for helperURI (that we call economy on some ini files, just because)

master
UbitUmarov 2020-05-08 17:00:43 +01:00
parent fa5b4dc5d8
commit bcb9ab29d7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
View File

@ -35,6 +35,7 @@ using Nini.Config;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using Mono.Addins; using Mono.Addins;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer; using OpenSim.Framework.Servers.HttpServer;
@ -66,6 +67,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
// private UUID EconomyBaseAccount = UUID.Zero; // private UUID EconomyBaseAccount = UUID.Zero;
private Dictionary<string, XmlRpcMethod> m_rpcHandlers; private Dictionary<string, XmlRpcMethod> m_rpcHandlers;
private string m_economyURL;
private float EnergyEfficiency = 1f; private float EnergyEfficiency = 1f;
// private ObjectPaid handerOnObjectPaid; // private ObjectPaid handerOnObjectPaid;
@ -140,12 +142,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
{ {
if (m_scenel.Count == 0) if (m_scenel.Count == 0)
{ {
// XMLRPCHandler = scene; m_economyURL = scene.RegionInfo.ServerURI;
// To use the following you need to add:
// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER>
// to the command line parameters you use to start up your client
// This commonly looks like -helperuri http://127.0.0.1:9000/
m_rpcHandlers = new Dictionary<string, XmlRpcMethod>(); m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
@ -174,7 +171,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
scene.EventManager.OnClientClosed += ClientClosed; scene.EventManager.OnClientClosed += ClientClosed;
scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel; scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
scene.EventManager.OnMakeChildAgent += MakeChildAgent; scene.EventManager.OnMakeChildAgent += MakeChildAgent;
scene.EventManager.OnClientClosed += ClientLoggedOut;
scene.EventManager.OnValidateLandBuy += ValidateLandBuy; scene.EventManager.OnValidateLandBuy += ValidateLandBuy;
scene.EventManager.OnLandBuy += processLandBuy; scene.EventManager.OnLandBuy += processLandBuy;
} }
@ -186,6 +182,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
public void RegionLoaded(Scene scene) public void RegionLoaded(Scene scene)
{ {
if (!m_enabled)
return;
if (!string.IsNullOrWhiteSpace(m_economyURL))
{
ISimulatorFeaturesModule fm = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
fm?.AddOpenSimExtraFeature("currency-base-uri", m_economyURL);
}
} }
public void processPHP(IOSHttpRequest request, IOSHttpResponse response) public void processPHP(IOSHttpRequest request, IOSHttpResponse response)
@ -313,7 +317,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
client.OnMoneyBalanceRequest += SendMoneyBalance; client.OnMoneyBalanceRequest += SendMoneyBalance;
client.OnRequestPayPrice += requestPayPrice; client.OnRequestPayPrice += requestPayPrice;
client.OnObjectBuy += ObjectBuy; client.OnObjectBuy += ObjectBuy;
client.OnLogout += ClientClosed; client.OnLogout += ClientLoggedOut;
} }
/// <summary> /// <summary>
@ -768,7 +772,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// Event Handler for when the client logs out. /// Event Handler for when the client logs out.
/// </summary> /// </summary>
/// <param name="AgentId"></param> /// <param name="AgentId"></param>
private void ClientLoggedOut(UUID AgentId, Scene scene) private void ClientLoggedOut(IClientAPI client)
{ {
} }