diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Tools/Configger/ConfigurationLoader.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Tools/Configger/ConfigurationLoader.cs')
-rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index 28bcc99..0b6ee9c 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs | |||
@@ -239,10 +239,7 @@ namespace OpenSim.Tools.Configger | |||
239 | config.Set("physics", "OpenDynamicsEngine"); | 239 | config.Set("physics", "OpenDynamicsEngine"); |
240 | config.Set("meshing", "Meshmerizer"); | 240 | config.Set("meshing", "Meshmerizer"); |
241 | config.Set("physical_prim", true); | 241 | config.Set("physical_prim", true); |
242 | config.Set("see_into_this_sim_from_neighbor", true); | ||
243 | config.Set("serverside_object_permissions", true); | 242 | config.Set("serverside_object_permissions", true); |
244 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); | ||
245 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | ||
246 | config.Set("storage_prim_inventories", true); | 243 | config.Set("storage_prim_inventories", true); |
247 | config.Set("startup_console_commands_file", String.Empty); | 244 | config.Set("startup_console_commands_file", String.Empty); |
248 | config.Set("shutdown_console_commands_file", String.Empty); | 245 | config.Set("shutdown_console_commands_file", String.Empty); |
@@ -254,6 +251,5 @@ namespace OpenSim.Tools.Configger | |||
254 | 251 | ||
255 | return defaultConfig; | 252 | return defaultConfig; |
256 | } | 253 | } |
257 | |||
258 | } | 254 | } |
259 | } | 255 | } \ No newline at end of file |