diff options
| author | Teravus Ovares | 2008-04-10 13:05:01 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-04-10 13:05:01 +0000 |
| commit | b92c6901ade7bd1647e473d3f48f9e8e145f0e63 (patch) | |
| tree | eef12a2c0f34912ee75f38b4dfe0f0381327dad0 /OpenSim/Region | |
| parent | * Made it safe again to use the restart button from the estate tools and the ... (diff) | |
| download | opensim-SC_OLD-b92c6901ade7bd1647e473d3f48f9e8e145f0e63.zip opensim-SC_OLD-b92c6901ade7bd1647e473d3f48f9e8e145f0e63.tar.gz opensim-SC_OLD-b92c6901ade7bd1647e473d3f48f9e8e145f0e63.tar.bz2 opensim-SC_OLD-b92c6901ade7bd1647e473d3f48f9e8e145f0e63.tar.xz | |
* Fix a null reference when there's no [Economy] section in the opensim.ini
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs | 6 |
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 | |||
| 115 | 115 | ||
| 116 | private void ReadConfigAndPopulate(Scene scene, IConfig startupConfig, string config) | 116 | private void ReadConfigAndPopulate(Scene scene, IConfig startupConfig, string config) |
| 117 | { | 117 | { |
| 118 | if (config == "Startup") | 118 | if (config == "Startup" && startupConfig != null) |
| 119 | { | 119 | { |
| 120 | gridmode = startupConfig.GetBoolean("gridmode", false); | 120 | gridmode = startupConfig.GetBoolean("gridmode", false); |
| 121 | m_enabled = (startupConfig.GetString("economymodule", "BetaGridLikeMoneyModule") == "BetaGridLikeMoneyModule"); | 121 | m_enabled = (startupConfig.GetString("economymodule", "BetaGridLikeMoneyModule") == "BetaGridLikeMoneyModule"); |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | if (config == "Economy") | 124 | if (config == "Economy" && startupConfig != null) |
| 125 | { | 125 | { |
| 126 | ObjectCapacity = startupConfig.GetInt("ObjectCapacity", 45000); | 126 | ObjectCapacity = startupConfig.GetInt("ObjectCapacity", 45000); |
| 127 | PriceEnergyUnit = startupConfig.GetInt("PriceEnergyUnit", 100); | 127 | PriceEnergyUnit = startupConfig.GetInt("PriceEnergyUnit", 100); |
| 128 | PriceObjectClaim = startupConfig.GetInt("PriceObjectClaim", 10); | 128 | PriceObjectClaim = startupConfig.GetInt("PriceObjectClaim", 10); |