ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-13 19:14:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

simple money module: do not override economy setting if defined

Browse Source
This commit is contained in:
UbitUmarov
2020-11-13 18:03:00 +00:00
parent a4f8df246d
commit 6f943ecdda
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,7 +182,8 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
{
if (!m_enabled)
return;
if(scene.SceneGridInfo!= null && !string.IsNullOrEmpty(scene.SceneGridInfo.EconomyURL))
return;
ISimulatorFeaturesModule fm = scene.RequestModuleInterface<ISimulatorFeaturesModule>();
if (fm != null && !string.IsNullOrWhiteSpace(m_localEconomyURL))
{
@@ -261,7 +262,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
// economymodule may be at startup or Economy (legacy)
string mmodule = startupConfig.GetString("economymodule","");
if(String.IsNullOrEmpty(mmodule))
if(string.IsNullOrEmpty(mmodule))
{
if(economyConfig != null)
{
@@ -271,7 +272,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
}
}
if (!String.IsNullOrEmpty(mmodule) && mmodule != Name)
if (!string.IsNullOrEmpty(mmodule) && mmodule != Name)
{
// some other money module selected
m_enabled = false;