aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs47
1 files changed, 23 insertions, 24 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4fc59e2..fc72946 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -651,10 +651,10 @@ namespace OpenSim.Region.Framework.Scenes
651 651
652 #region Region Config 652 #region Region Config
653 653
654 try 654 // Region config overrides global config
655 //
656 if (m_config.Configs["Startup"] != null)
655 { 657 {
656 // Region config overrides global config
657 //
658 IConfig startupConfig = m_config.Configs["Startup"]; 658 IConfig startupConfig = m_config.Configs["Startup"];
659 659
660 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance); 660 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
@@ -756,37 +756,34 @@ namespace OpenSim.Region.Framework.Scenes
756 756
757 #region Interest Management 757 #region Interest Management
758 758
759 if (m_config != null) 759 IConfig interestConfig = m_config.Configs["InterestManagement"];
760 if (interestConfig != null)
760 { 761 {
761 IConfig interestConfig = m_config.Configs["InterestManagement"]; 762 string update_prioritization_scheme = interestConfig.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
762 if (interestConfig != null)
763 {
764 string update_prioritization_scheme = interestConfig.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
765 763
766 try 764 try
767 { 765 {
768 m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true); 766 m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
769 } 767 }
770 catch (Exception) 768 catch (Exception)
771 { 769 {
772 m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time"); 770 m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
773 m_priorityScheme = UpdatePrioritizationSchemes.Time; 771 m_priorityScheme = UpdatePrioritizationSchemes.Time;
774 }
775
776 m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
777 m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
778 m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
779 m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
780 } 772 }
773
774 m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
775 m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
776 m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
777 m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
781 } 778 }
782 779
783 m_log.InfoFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme); 780 m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme);
784 781
785 #endregion Interest Management 782 #endregion Interest Management
786 783
787 StatsReporter = new SimStatsReporter(this); 784 StatsReporter = new SimStatsReporter(this);
788 StatsReporter.OnSendStatsResult += SendSimStatsPackets; 785 StatsReporter.OnSendStatsResult += SendSimStatsPackets;
789 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; 786 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
790 } 787 }
791 788
792 /// <summary> 789 /// <summary>
@@ -1102,6 +1099,8 @@ namespace OpenSim.Region.Framework.Scenes
1102 { 1099 {
1103 m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName); 1100 m_log.InfoFormat("[SCENE]: Closing down the single simulator: {0}", RegionInfo.RegionName);
1104 1101
1102 StatsReporter.Close();
1103
1105 m_restartTimer.Stop(); 1104 m_restartTimer.Stop();
1106 m_restartTimer.Close(); 1105 m_restartTimer.Close();
1107 1106