diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e488fe1..a87dfb7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -684,8 +684,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
684 | //Animation states | 684 | //Animation states |
685 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | 685 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); |
686 | 686 | ||
687 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", true); | 687 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims); |
688 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", true); | 688 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", CollidablePrims); |
689 | 689 | ||
690 | m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); | 690 | m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); |
691 | if (RegionInfo.NonphysPrimMax > 0) | 691 | if (RegionInfo.NonphysPrimMax > 0) |
@@ -800,13 +800,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
800 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; | 800 | StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; |
801 | } | 801 | } |
802 | 802 | ||
803 | /// <summary> | ||
804 | /// Mock constructor for scene group persistency unit tests. | ||
805 | /// SceneObjectGroup RegionId property is delegated to Scene. | ||
806 | /// </summary> | ||
807 | /// <param name="regInfo"></param> | ||
808 | public Scene(RegionInfo regInfo) | 803 | public Scene(RegionInfo regInfo) |
809 | { | 804 | { |
805 | PhysicalPrims = true; | ||
806 | CollidablePrims = true; | ||
807 | |||
810 | BordersLocked = true; | 808 | BordersLocked = true; |
811 | Border northBorder = new Border(); | 809 | Border northBorder = new Border(); |
812 | northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- | 810 | northBorder.BorderLine = new Vector3(float.MinValue, float.MaxValue, (int)Constants.RegionSize); //<--- |
@@ -833,8 +831,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
833 | m_eventManager = new EventManager(); | 831 | m_eventManager = new EventManager(); |
834 | 832 | ||
835 | m_permissions = new ScenePermissions(this); | 833 | m_permissions = new ScenePermissions(this); |
836 | |||
837 | // m_lastUpdate = Util.EnvironmentTickCount(); | ||
838 | } | 834 | } |
839 | 835 | ||
840 | #endregion | 836 | #endregion |