From 6f943ecddaa85943ebca4e8a98229b6f1a3b77d3 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Fri, 13 Nov 2020 18:03:00 +0000
Subject: [PATCH] simple money module: do not override economy setting if
 defined

---
 .../OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 77f7b8cb3a..f543d02eeb 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -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;