aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/RegionInfo.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 928e798..016f2a6 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -643,11 +643,11 @@ namespace OpenSim.Framework
643 643
644 #region Prim stuff 644 #region Prim stuff
645 645
646 m_nonphysPrimMin = config.GetFloat("NonphysicalPrimMin", 0); 646 m_nonphysPrimMin = config.GetFloat("NonPhysicalPrimMin", 0);
647 allKeys.Remove("NonphysicalPrimMin"); 647 allKeys.Remove("NonPhysicalPrimMin");
648 648
649 m_nonphysPrimMax = config.GetInt("NonphysicalPrimMax", 0); 649 m_nonphysPrimMax = config.GetInt("NonPhysicalPrimMax", 0);
650 allKeys.Remove("NonphysicalPrimMax"); 650 allKeys.Remove("NonPhysicalPrimMax");
651 651
652 m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0); 652 m_physPrimMin = config.GetFloat("PhysicalPrimMin", 0);
653 allKeys.Remove("PhysicalPrimMin"); 653 allKeys.Remove("PhysicalPrimMin");
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9c3c53d..a27e126 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Scenes
116 /// <summary> 116 /// <summary>
117 /// Minimum value of the size of a physical prim in each axis 117 /// Minimum value of the size of a physical prim in each axis
118 /// </summary> 118 /// </summary>
119 public float m_minPhys = 0.01f; 119 public float m_minPhys = 0.001f;
120 120
121 /// <summary> 121 /// <summary>
122 /// Maximum value of the size of a physical prim in each axis 122 /// Maximum value of the size of a physical prim in each axis
@@ -744,13 +744,13 @@ namespace OpenSim.Region.Framework.Scenes
744 PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims); 744 PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims);
745 CollidablePrims = startupConfig.GetBoolean("collidable_prim", CollidablePrims); 745 CollidablePrims = startupConfig.GetBoolean("collidable_prim", CollidablePrims);
746 746
747 m_minNonphys = startupConfig.GetFloat("NonphysicalPrimMin", m_minNonphys); 747 m_minNonphys = startupConfig.GetFloat("NonPhysicalPrimMin", m_minNonphys);
748 if (RegionInfo.NonphysPrimMin > 0) 748 if (RegionInfo.NonphysPrimMin > 0)
749 { 749 {
750 m_minNonphys = RegionInfo.NonphysPrimMin; 750 m_minNonphys = RegionInfo.NonphysPrimMin;
751 } 751 }
752 752
753 m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); 753 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
754 if (RegionInfo.NonphysPrimMax > 0) 754 if (RegionInfo.NonphysPrimMax > 0)
755 { 755 {
756 m_maxNonphys = RegionInfo.NonphysPrimMax; 756 m_maxNonphys = RegionInfo.NonphysPrimMax;