diff options
author | Justin Clark-Casey (justincc) | 2014-08-14 01:16:58 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-08-14 01:16:58 +0100 |
commit | 6ea82ad48a192be06592e709014142ccd2a9e48c (patch) | |
tree | 7bf3f0bfe5ec1a0628f1380ab4ac51fd5b57956a /OpenSim/Region/Framework/Scenes | |
parent | Update OpenID server handler with proper interface. fixes http://opensimulato... (diff) | |
download | opensim-SC_OLD-6ea82ad48a192be06592e709014142ccd2a9e48c.zip opensim-SC_OLD-6ea82ad48a192be06592e709014142ccd2a9e48c.tar.gz opensim-SC_OLD-6ea82ad48a192be06592e709014142ccd2a9e48c.tar.bz2 opensim-SC_OLD-6ea82ad48a192be06592e709014142ccd2a9e48c.tar.xz |
Make some existing reprioritization values changeable outside the scene for test purposes, and use more consise property syntax.
No functional change.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fa9efc6..2762312 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -455,11 +455,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
455 | 455 | ||
456 | // private int m_lastUpdate; | 456 | // private int m_lastUpdate; |
457 | // private bool m_firstHeartbeat = true; | 457 | // private bool m_firstHeartbeat = true; |
458 | |||
459 | private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time; | ||
460 | private bool m_reprioritizationEnabled = true; | ||
461 | private double m_reprioritizationInterval = 5000.0; | ||
462 | private double m_rootReprioritizationDistance = 10.0; | ||
463 | 458 | ||
464 | private Timer m_mapGenerationTimer = new Timer(); | 459 | private Timer m_mapGenerationTimer = new Timer(); |
465 | private bool m_generateMaptiles; | 460 | private bool m_generateMaptiles; |
@@ -692,10 +687,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
692 | public int MonitorLandTime { get { return landMS; } } | 687 | public int MonitorLandTime { get { return landMS; } } |
693 | public int MonitorLastFrameTick { get { return m_lastFrameTick; } } | 688 | public int MonitorLastFrameTick { get { return m_lastFrameTick; } } |
694 | 689 | ||
695 | public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get { return m_priorityScheme; } } | 690 | public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get; set; } |
696 | public bool IsReprioritizationEnabled { get { return m_reprioritizationEnabled; } } | 691 | public bool IsReprioritizationEnabled { get; set; } |
697 | public double ReprioritizationInterval { get { return m_reprioritizationInterval; } } | 692 | public double ReprioritizationInterval { get; set; } |
698 | public double RootReprioritizationDistance { get { return m_rootReprioritizationDistance; } } | 693 | public double RootReprioritizationDistance { get; set; } |
699 | public double ChildReprioritizationDistance { get; set; } | 694 | public double ChildReprioritizationDistance { get; set; } |
700 | 695 | ||
701 | public AgentCircuitManager AuthenticateHandler | 696 | public AgentCircuitManager AuthenticateHandler |
@@ -1022,17 +1017,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
1022 | 1017 | ||
1023 | try | 1018 | try |
1024 | { | 1019 | { |
1025 | m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true); | 1020 | UpdatePrioritizationScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true); |
1026 | } | 1021 | } |
1027 | catch (Exception) | 1022 | catch (Exception) |
1028 | { | 1023 | { |
1029 | m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time"); | 1024 | m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time"); |
1030 | m_priorityScheme = UpdatePrioritizationSchemes.Time; | 1025 | UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time; |
1031 | } | 1026 | } |
1032 | 1027 | ||
1033 | m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true); | 1028 | IsReprioritizationEnabled |
1034 | m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0); | 1029 | = interestConfig.GetBoolean("ReprioritizationEnabled", IsReprioritizationEnabled); |
1035 | m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0); | 1030 | ReprioritizationInterval |
1031 | = interestConfig.GetDouble("ReprioritizationInterval", ReprioritizationInterval); | ||
1032 | RootReprioritizationDistance | ||
1033 | = interestConfig.GetDouble("RootReprioritizationDistance", RootReprioritizationDistance); | ||
1036 | ChildReprioritizationDistance | 1034 | ChildReprioritizationDistance |
1037 | = interestConfig.GetDouble("ChildReprioritizationDistance", ChildReprioritizationDistance); | 1035 | = interestConfig.GetDouble("ChildReprioritizationDistance", ChildReprioritizationDistance); |
1038 | 1036 | ||
@@ -1044,7 +1042,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1044 | = interestConfig.GetFloat("RootVelocityUpdateTolerance", RootVelocityUpdateTolerance); | 1042 | = interestConfig.GetFloat("RootVelocityUpdateTolerance", RootVelocityUpdateTolerance); |
1045 | } | 1043 | } |
1046 | 1044 | ||
1047 | m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", m_priorityScheme); | 1045 | m_log.DebugFormat("[SCENE]: Using the {0} prioritization scheme", UpdatePrioritizationScheme); |
1048 | 1046 | ||
1049 | #endregion Interest Management | 1047 | #endregion Interest Management |
1050 | 1048 | ||
@@ -1078,9 +1076,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1078 | PeriodicBackup = true; | 1076 | PeriodicBackup = true; |
1079 | UseBackup = true; | 1077 | UseBackup = true; |
1080 | 1078 | ||
1079 | IsReprioritizationEnabled = true; | ||
1080 | UpdatePrioritizationScheme = UpdatePrioritizationSchemes.Time; | ||
1081 | ReprioritizationInterval = 5000; | ||
1082 | |||
1081 | RootRotationUpdateTolerance = 0.1f; | 1083 | RootRotationUpdateTolerance = 0.1f; |
1082 | RootVelocityUpdateTolerance = 0.001f; | 1084 | RootVelocityUpdateTolerance = 0.001f; |
1083 | RootPositionUpdateTolerance = 0.05f; | 1085 | RootPositionUpdateTolerance = 0.05f; |
1086 | RootReprioritizationDistance = 10.0; | ||
1084 | ChildReprioritizationDistance = 20.0; | 1087 | ChildReprioritizationDistance = 20.0; |
1085 | 1088 | ||
1086 | m_eventManager = new EventManager(); | 1089 | m_eventManager = new EventManager(); |