From 4b58d4ff95891e5d0f15801c8a48c57309925738 Mon Sep 17 00:00:00 2001 From: Dan Lake Date: Tue, 1 Nov 2011 16:51:14 -0700 Subject: [PATCH] Removed see_into_this_sim_from_neighbor configuration option. --- OpenSim/Region/Framework/Scenes/Scene.cs | 10 ---------- OpenSim/Region/Framework/Scenes/SceneViewer.cs | 2 +- bin/OpenSimDefaults.ini | 3 --- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e054f1b9b6..086de53103 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -86,7 +86,6 @@ namespace OpenSim.Region.Framework.Scenes public bool m_allowScriptCrossings; public bool m_useFlySlow; public bool m_usePreJump; - public bool m_seeIntoRegionFromNeighbor; protected float m_defaultDrawDistance = 255.0f; public float DefaultDrawDistance @@ -638,14 +637,6 @@ namespace OpenSim.Region.Framework.Scenes m_physics_enabled = !RegionInfo.RegionSettings.DisablePhysics; - // Old - /* - m_simulatorVersion = simulatorVersion - + " (OS " + Util.GetOperatingSystemInformation() + ")" - + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() - + " PhysPrim:" + m_physicalPrim.ToString(); - */ - m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")"; #region Region Config @@ -690,7 +681,6 @@ namespace OpenSim.Region.Framework.Scenes m_clampPrimSize = true; } - m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); m_dontPersistBefore = diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 50e1e39afe..ded90a3735 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs @@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes { if (m_pendingObjects == null) { - if (!m_presence.IsChildAgent || (m_presence.Scene.m_seeIntoRegionFromNeighbor)) + if (!m_presence.IsChildAgent) { m_pendingObjects = new Queue(); diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index db2a551b27..d79cb1e3ca 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -170,9 +170,6 @@ ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago MaximumTimeBeforePersistenceConsidered = 600 - ; Should avatars in neighbor sims see objects in this sim? - see_into_this_sim_from_neighbor = true - ; ## ; ## PHYSICS ; ##