diff options
| author | root | 2011-07-05 04:01:59 +0100 |
|---|---|---|
| committer | root | 2011-07-05 04:01:59 +0100 |
| commit | 47cf9c8fe060af89cc14817dc762bcbfef956d5e (patch) | |
| tree | 56b21e617bbb4ce3a613780c81178de41ff062d3 /OpenSim/Region/Application | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Add TestClearCache() (diff) | |
| download | opensim-SC-47cf9c8fe060af89cc14817dc762bcbfef956d5e.zip opensim-SC-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.gz opensim-SC-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.bz2 opensim-SC-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 2d81ea8..d19852b 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
| @@ -328,7 +328,7 @@ namespace OpenSim | |||
| 328 | config.Set("meshing", "Meshmerizer"); | 328 | config.Set("meshing", "Meshmerizer"); |
| 329 | config.Set("physical_prim", true); | 329 | config.Set("physical_prim", true); |
| 330 | config.Set("see_into_this_sim_from_neighbor", true); | 330 | config.Set("see_into_this_sim_from_neighbor", true); |
| 331 | config.Set("serverside_object_permissions", false); | 331 | config.Set("serverside_object_permissions", true); |
| 332 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); | 332 | config.Set("storage_plugin", "OpenSim.Data.SQLite.dll"); |
| 333 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); | 333 | config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); |
| 334 | config.Set("storage_prim_inventories", true); | 334 | config.Set("storage_prim_inventories", true); |