Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
author: Melanie 2013-08-07 23:29:42 +0100
committer: Melanie 2013-08-07 23:29:42 +0100
commit: 005c69511dac490a8353233423a3152abf5580dd (patch)
tree: abae7717af4af3ed7844f3747ab28398fdad9cdf /OpenSim/Region/Application/ConfigurationLoader.cs
parent: Merge branch 'avination-current' into careminster (diff)
parent: minor: add some method doc to ScenePresence fields used for entity transfer, ... (diff)
download: opensim-SC-005c69511dac490a8353233423a3152abf5580dd.zip
opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.gz
opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.bz2
opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index fc3999f..3e93638 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -337,7 +337,6 @@ namespace OpenSim
                config.Set("physics", "OpenDynamicsEngine");
                config.Set("meshing", "Meshmerizer");
                config.Set("physical_prim", true);
-                config.Set("see_into_this_sim_from_neighbor", true);
                config.Set("serverside_object_permissions", true);
                config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
                config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
author	Melanie	2013-08-07 23:29:42 +0100
committer	Melanie	2013-08-07 23:29:42 +0100
commit	005c69511dac490a8353233423a3152abf5580dd (patch)
tree	abae7717af4af3ed7844f3747ab28398fdad9cdf /OpenSim/Region/Application/ConfigurationLoader.cs
parent	Merge branch 'avination-current' into careminster (diff)
parent	minor: add some method doc to ScenePresence fields used for entity transfer, ... (diff)
download	opensim-SC-005c69511dac490a8353233423a3152abf5580dd.zip opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.gz opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.bz2 opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.xz

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index fc3999f..3e93638 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -337,7 +337,6 @@ namespace OpenSim
337	config.Set("physics", "OpenDynamicsEngine");	337	config.Set("physics", "OpenDynamicsEngine");
338	config.Set("meshing", "Meshmerizer");	338	config.Set("meshing", "Meshmerizer");
339	config.Set("physical_prim", true);	339	config.Set("physical_prim", true);
340	config.Set("see_into_this_sim_from_neighbor", true);
341	config.Set("serverside_object_permissions", true);	340	config.Set("serverside_object_permissions", true);
342	config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");	341	config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
343	config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");	342	config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");