From d95bfc8eec0fcce9d92cb7c19e2d1c120ce2519e Mon Sep 17 00:00:00 2001
From: diva
Date: Sun, 26 Apr 2009 23:21:56 +0000
Subject: Bug fix in initialization of RegionAssetServer/MXP. Sometimes the MXP
 section in ini doesn't exist.

---
 OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

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
                 m_scene = scene;
 
                 // This module is only on for standalones in hypergrid mode
-                enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && 
-                    (config.Configs["Startup"].GetBoolean("hypergrid", true)||
-                    config.Configs["MXP"].GetBoolean("Enabled", true));
+                enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) && 
+                    config.Configs["Startup"].GetBoolean("hypergrid", true)) ||
+                    ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true));
             }
         }
 
-- 
cgit v1.1