aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs2
-rw-r--r--bin/OpenSimDefaults.ini3
3 files changed, 1 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e054f1b..086de53 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -86,7 +86,6 @@ namespace OpenSim.Region.Framework.Scenes
86 public bool m_allowScriptCrossings; 86 public bool m_allowScriptCrossings;
87 public bool m_useFlySlow; 87 public bool m_useFlySlow;
88 public bool m_usePreJump; 88 public bool m_usePreJump;
89 public bool m_seeIntoRegionFromNeighbor;
90 89
91 protected float m_defaultDrawDistance = 255.0f; 90 protected float m_defaultDrawDistance = 255.0f;
92 public float DefaultDrawDistance 91 public float DefaultDrawDistance
@@ -638,14 +637,6 @@ namespace OpenSim.Region.Framework.Scenes
638 637
639 m_physics_enabled = !RegionInfo.RegionSettings.DisablePhysics; 638 m_physics_enabled = !RegionInfo.RegionSettings.DisablePhysics;
640 639
641 // Old
642 /*
643 m_simulatorVersion = simulatorVersion
644 + " (OS " + Util.GetOperatingSystemInformation() + ")"
645 + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
646 + " PhysPrim:" + m_physicalPrim.ToString();
647 */
648
649 m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")"; 640 m_simulatorVersion = simulatorVersion + " (" + Util.GetRuntimeInformation() + ")";
650 641
651 #region Region Config 642 #region Region Config
@@ -690,7 +681,6 @@ namespace OpenSim.Region.Framework.Scenes
690 m_clampPrimSize = true; 681 m_clampPrimSize = true;
691 } 682 }
692 683
693 m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
694 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); 684 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
695 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); 685 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
696 m_dontPersistBefore = 686 m_dontPersistBefore =
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 50e1e39..ded90a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes
84 { 84 {
85 if (m_pendingObjects == null) 85 if (m_pendingObjects == null)
86 { 86 {
87 if (!m_presence.IsChildAgent || (m_presence.Scene.m_seeIntoRegionFromNeighbor)) 87 if (!m_presence.IsChildAgent)
88 { 88 {
89 m_pendingObjects = new Queue<SceneObjectGroup>(); 89 m_pendingObjects = new Queue<SceneObjectGroup>();
90 90
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index db2a551..d79cb1e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -170,9 +170,6 @@
170 ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago 170 ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
171 MaximumTimeBeforePersistenceConsidered = 600 171 MaximumTimeBeforePersistenceConsidered = 600
172 172
173 ; Should avatars in neighbor sims see objects in this sim?
174 see_into_this_sim_from_neighbor = true
175
176 ; ## 173 ; ##
177 ; ## PHYSICS 174 ; ## PHYSICS
178 ; ## 175 ; ##