aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2008-12-11 20:43:21 +0000
committerSean Dague2008-12-11 20:43:21 +0000
commit616cf74e73226b2160558af6fcd24578b9ffdfa6 (patch)
tree3a9361655f508074d7adee69f0dbcffc04b5044d /OpenSim
parent* Add get child folder test (diff)
downloadopensim-SC_OLD-616cf74e73226b2160558af6fcd24578b9ffdfa6.zip
opensim-SC_OLD-616cf74e73226b2160558af6fcd24578b9ffdfa6.tar.gz
opensim-SC_OLD-616cf74e73226b2160558af6fcd24578b9ffdfa6.tar.bz2
opensim-SC_OLD-616cf74e73226b2160558af6fcd24578b9ffdfa6.tar.xz
make a couple of other config default to make the example ini to give us
a better chance of working out of the box
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 17080ca..5e066fe 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -116,6 +116,8 @@ namespace OpenSim
116 if (null == config) 116 if (null == config)
117 config = defaultConfig.AddConfig("Startup"); 117 config = defaultConfig.AddConfig("Startup");
118 118
119 config.Set("region_info_source", "filesystem");
120
119 config.Set("gridmode", false); 121 config.Set("gridmode", false);
120 config.Set("physics", "basicphysics"); 122 config.Set("physics", "basicphysics");
121 config.Set("meshing", "ZeroMesher"); 123 config.Set("meshing", "ZeroMesher");
@@ -128,8 +130,10 @@ namespace OpenSim
128 config.Set("startup_console_commands_file", String.Empty); 130 config.Set("startup_console_commands_file", String.Empty);
129 config.Set("shutdown_console_commands_file", String.Empty); 131 config.Set("shutdown_console_commands_file", String.Empty);
130 config.Set("DefaultScriptEngine", "XEngine"); 132 config.Set("DefaultScriptEngine", "XEngine");
131 config.Set("asset_database", "sqlite"); 133 config.Set("asset_database", "local");
132 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 134 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
135 // life doesn't really work without this
136 config.Set("EventQueue", true);
133 } 137 }
134 138
135 { 139 {
@@ -167,7 +171,7 @@ namespace OpenSim
167 config.Set("user_recv_key", "null"); 171 config.Set("user_recv_key", "null");
168 config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()); 172 config.Set("asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString());
169 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); 173 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString());
170 config.Set("secure_inventory_server", "true"); 174 config.Set("secure_inventory_server", "false");
171 } 175 }
172 176
173 return defaultConfig; 177 return defaultConfig;