Merge branch 'feature/gloebit-configuration' into develop

OpenSim-NGC · Jul 22, 2023 · 8fac176 · 8fac176
2 parents cd76839 + 98413d7
commit 8fac176
Show file tree

Hide file tree

Showing 3 changed files with 193 additions and 227 deletions.
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
@@ -39,7 +39,7 @@ public class VersionInfo
     {
         public const string VersionNumber = "0.9.2.2";
         public const string AssemblyVersionNumber = "0.9.2.2";
-        public const string Release = "8593";
+        public const string Release = "8603";
 
         public const Flavour VERSION_FLAVOUR = Flavour.Dev;
 

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -253,24 +253,11 @@ private void ReadConfigAndPopulate()
         {
             // we are enabled by default
 
-            IConfig startupConfig = m_gConfig.Configs["Startup"];
-
-            if(startupConfig == null) // should not happen
-                return;
-
             IConfig economyConfig = m_gConfig.Configs["Economy"];
 
-            // economymodule may be at startup or Economy (legacy)
-            string mmodule = startupConfig.GetString("economymodule","");
-            if(string.IsNullOrEmpty(mmodule))
-            {
-                if(economyConfig != null)
-                {
-                    mmodule = economyConfig.GetString("economymodule", "");
-                    if (String.IsNullOrEmpty(mmodule))
-                        mmodule = economyConfig.GetString("EconomyModule", "");
-                }
-            }
+            var mmodule = economyConfig?.GetString("economymodule", "");
+            if (String.IsNullOrEmpty(mmodule))
+                mmodule = economyConfig?.GetString("EconomyModule", "");
 
             if (!string.IsNullOrEmpty(mmodule) && mmodule != Name)
             {