aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMW2007-10-29 09:51:23 +0000
committerMW2007-10-29 09:51:23 +0000
commit27f003b68314ea5136632d6f9d14057c96ade1e1 (patch)
tree3bbdb9bb3fac97922768c2f6d0acd5dae3c4278f /OpenSim/Region/Application
parentnormalized line endings (diff)
downloadopensim-SC-27f003b68314ea5136632d6f9d14057c96ade1e1.zip
opensim-SC-27f003b68314ea5136632d6f9d14057c96ade1e1.tar.gz
opensim-SC-27f003b68314ea5136632d6f9d14057c96ade1e1.tar.bz2
opensim-SC-27f003b68314ea5136632d6f9d14057c96ade1e1.tar.xz
Started the process of cleaning up AssetCache and moving most of the code into modules. Have moved TextureRequest handling (from the client) to a module. But even though to start with I just did a little bit of cleaning up of the existing code, it doesn't seem to work as good as the old code so I need to spend more time on it. So for now am committing my changes but with them not in use. So for now all Texture and asset requests are still handled by the old code in AssetCache.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index bb26cae..8ea9347 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -149,11 +149,6 @@ namespace OpenSim
149 149
150 config.Set("asset_database", "sqlite"); 150 config.Set("asset_database", "sqlite");
151 151
152 // wtf?
153 config.Set("default_modules", true);
154 config.Set("default_shared_modules", true);
155 config.Set("except_modules", "");
156 config.Set("except_shared_modules", "");
157 } 152 }
158 153
159 if (m_config.Configs["StandAlone"] == null) 154 if (m_config.Configs["StandAlone"] == null)
@@ -195,6 +190,7 @@ namespace OpenSim
195 m_networkServersInfo = new NetworkServersInfo(); 190 m_networkServersInfo = new NetworkServersInfo();
196 191
197 IConfig startupConfig = m_config.Configs["Startup"]; 192 IConfig startupConfig = m_config.Configs["Startup"];
193
198 if (startupConfig != null) 194 if (startupConfig != null)
199 { 195 {
200 m_sandbox = !startupConfig.GetBoolean("gridmode", false); 196 m_sandbox = !startupConfig.GetBoolean("gridmode", false);