aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-04-26 23:21:56 +0000
committerdiva2009-04-26 23:21:56 +0000
commitd95bfc8eec0fcce9d92cb7c19e2d1c120ce2519e (patch)
tree63c4d6c64df3cf511fce10a5e4af0f8dad81188d
parent- Setting groups-messaging module to by disabled by default (groups module al... (diff)
downloadopensim-SC_OLD-d95bfc8eec0fcce9d92cb7c19e2d1c120ce2519e.zip
opensim-SC_OLD-d95bfc8eec0fcce9d92cb7c19e2d1c120ce2519e.tar.gz
opensim-SC_OLD-d95bfc8eec0fcce9d92cb7c19e2d1c120ce2519e.tar.bz2
opensim-SC_OLD-d95bfc8eec0fcce9d92cb7c19e2d1c120ce2519e.tar.xz
Bug fix in initialization of RegionAssetServer/MXP. Sometimes the MXP section in ini doesn't exist.
-rw-r--r--OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
index 693217b..7fac319 100644
--- a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
@@ -58,9 +58,9 @@ namespace OpenSim.Region.CoreModules.Framework.Services
58 m_scene = scene; 58 m_scene = scene;
59 59
60 // This module is only on for standalones in hypergrid mode 60 // This module is only on for standalones in hypergrid mode
61 enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && 61 enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
62 (config.Configs["Startup"].GetBoolean("hypergrid", true)|| 62 config.Configs["Startup"].GetBoolean("hypergrid", true)) ||
63 config.Configs["MXP"].GetBoolean("Enabled", true)); 63 ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true));
64 } 64 }
65 } 65 }
66 66