From 27c8cc5b1fc78bad6a8286f4236e4ac094b32e52 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Tue, 21 Apr 2009 19:42:36 +0000
Subject: Thank you kindly, TLaukkan for a patch that: Added support for
 loading bare asset binaries (as opposed to xml encoded asset base) to both
 sandbox asset service and cable beach. * Added support for enabling region
 asset service when mxp is enabled. * Moved base http server content type
 defaulting before invocation of request handle method to allow for variable
 content type in the response.

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

(limited to 'OpenSim/Region/CoreModules/Framework/Services')

diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
index 37cda17..693217b 100644
--- a/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs
@@ -58,7 +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", false);
+                enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && 
+                    (config.Configs["Startup"].GetBoolean("hypergrid", true)||
+                    config.Configs["MXP"].GetBoolean("Enabled", true));
             }
         }
 
-- 
cgit v1.1