aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie Thielker2015-11-26 17:29:50 +0100
committerMelanie Thielker2015-11-26 17:29:50 +0100
commit9afe2b018fbe444c0500695dbce37bdce126feee (patch)
tree8f1fe3730000885866a3883edc25ca0a7d897e97 /OpenSim/Region/Framework/Scenes/Scene.cs
parent suspend the use of DisableSimulator, that is causing teleport and crossing i... (diff)
downloadopensim-SC-9afe2b018fbe444c0500695dbce37bdce126feee.zip
opensim-SC-9afe2b018fbe444c0500695dbce37bdce126feee.tar.gz
opensim-SC-9afe2b018fbe444c0500695dbce37bdce126feee.tar.bz2
opensim-SC-9afe2b018fbe444c0500695dbce37bdce126feee.tar.xz
Mantis #7765: Add new ClampNegativeZ option. Defaults to false to restore prior functionality.
Avination code wasn't designed for deep building.
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 55c4fda..2296981 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -174,6 +174,13 @@ namespace OpenSim.Region.Framework.Scenes
174 174
175 public SynchronizeSceneHandler SynchronizeScene; 175 public SynchronizeSceneHandler SynchronizeScene;
176 176
177 public bool ClampNegativeZ
178 {
179 get { return m_clampNegativeZ; }
180 }
181
182 private bool m_clampNegativeZ = false;
183
177 /// <summary> 184 /// <summary>
178 /// Used to prevent simultaneous calls to code that adds and removes agents. 185 /// Used to prevent simultaneous calls to code that adds and removes agents.
179 /// </summary> 186 /// </summary>
@@ -1029,6 +1036,8 @@ namespace OpenSim.Region.Framework.Scenes
1029 m_clampPrimSize = true; 1036 m_clampPrimSize = true;
1030 } 1037 }
1031 1038
1039 m_clampNegativeZ = startupConfig.GetBoolean("ClampNegativeZ", m_clampNegativeZ);
1040
1032 m_useTrashOnDelete = startupConfig.GetBoolean("UseTrashOnDelete",m_useTrashOnDelete); 1041 m_useTrashOnDelete = startupConfig.GetBoolean("UseTrashOnDelete",m_useTrashOnDelete);
1033 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); 1042 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
1034 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); 1043 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);