aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorCharles Krinke2009-04-21 19:42:36 +0000
committerCharles Krinke2009-04-21 19:42:36 +0000
commit27c8cc5b1fc78bad6a8286f4236e4ac094b32e52 (patch)
tree36fecde27c8a877ba74952d2203eb10b92b46e35 /OpenSim/Region/CoreModules
parent* extend user cache update test to check data backend (diff)
downloadopensim-SC_OLD-27c8cc5b1fc78bad6a8286f4236e4ac094b32e52.zip
opensim-SC_OLD-27c8cc5b1fc78bad6a8286f4236e4ac094b32e52.tar.gz
opensim-SC_OLD-27c8cc5b1fc78bad6a8286f4236e4ac094b32e52.tar.bz2
opensim-SC_OLD-27c8cc5b1fc78bad6a8286f4236e4ac094b32e52.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/Services/RegionAssetService.cs4
1 files changed, 3 insertions, 1 deletions
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
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) && config.Configs["Startup"].GetBoolean("hypergrid", false); 61 enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
62 (config.Configs["Startup"].GetBoolean("hypergrid", true)||
63 config.Configs["MXP"].GetBoolean("Enabled", true));
62 } 64 }
63 } 65 }
64 66