From b92c6901ade7bd1647e473d3f48f9e8e145f0e63 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Thu, 10 Apr 2008 13:05:01 +0000 Subject: [PATCH] * Fix a null reference when there's no [Economy] section in the opensim.ini --- .../Region/Environment/Modules/BetaGridLikeMoneyModule.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs index 74ae0dc9d1..c66e639f4d 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);