* Fix a null reference when there's no [Economy] section in the opensim.ini

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
index 74ae0dc..c66e639 100644
--- a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
@@ -115,14 +115,14 @@ namespace OpenSim.Region.Environment.Modules
 
         private void ReadConfigAndPopulate(Scene scene, IConfig startupConfig, string config)
         {
-            if (config == "Startup")
+            if (config == "Startup" && startupConfig != null)
             {
                 gridmode = startupConfig.GetBoolean("gridmode", false);
                 m_enabled = (startupConfig.GetString("economymodule", "BetaGridLikeMoneyModule") == "BetaGridLikeMoneyModule");
             }
 
-            if (config == "Economy")
-            {    
+            if (config == "Economy" && startupConfig != null)
+            {   
                 ObjectCapacity = startupConfig.GetInt("ObjectCapacity", 45000);
                 PriceEnergyUnit = startupConfig.GetInt("PriceEnergyUnit", 100);
                 PriceObjectClaim = startupConfig.GetInt("PriceObjectClaim", 10);