OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

establish a minimun for ReprioritizationDistance

LSLKeyTest
UbitUmarov 2015-12-19 17:39:42 +00:00
parent 48f6010a1c
commit 01a27e8c71
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -801,9 +801,10 @@ namespace OpenSim.Region.Framework.Scenes
public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get; set; } public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get; set; }
public bool IsReprioritizationEnabled { get; set; } public bool IsReprioritizationEnabled { get; set; }
public double ReprioritizationInterval { get; set; } public float ReprioritizationInterval { get; set; }
public double RootReprioritizationDistance { get; set; } public float RootReprioritizationDistance { get; set; }
public double ChildReprioritizationDistance { get; set; } public float ChildReprioritizationDistance { get; set; }
private float m_minReprioritizationDistance = 32f;
public AgentCircuitManager AuthenticateHandler public AgentCircuitManager AuthenticateHandler
{ {
@ -1181,11 +1182,16 @@ namespace OpenSim.Region.Framework.Scenes
IsReprioritizationEnabled IsReprioritizationEnabled
= interestConfig.GetBoolean("ReprioritizationEnabled", IsReprioritizationEnabled); = interestConfig.GetBoolean("ReprioritizationEnabled", IsReprioritizationEnabled);
ReprioritizationInterval ReprioritizationInterval
= interestConfig.GetDouble("ReprioritizationInterval", ReprioritizationInterval); = interestConfig.GetFloat("ReprioritizationInterval", ReprioritizationInterval);
RootReprioritizationDistance RootReprioritizationDistance
= interestConfig.GetDouble("RootReprioritizationDistance", RootReprioritizationDistance); = interestConfig.GetFloat("RootReprioritizationDistance", RootReprioritizationDistance);
ChildReprioritizationDistance ChildReprioritizationDistance
= interestConfig.GetDouble("ChildReprioritizationDistance", ChildReprioritizationDistance); = interestConfig.GetFloat("ChildReprioritizationDistance", ChildReprioritizationDistance);
if(RootReprioritizationDistance < m_minReprioritizationDistance)
RootReprioritizationDistance = m_minReprioritizationDistance;
if(ChildReprioritizationDistance < m_minReprioritizationDistance)
ChildReprioritizationDistance = m_minReprioritizationDistance;
RootTerseUpdatePeriod = interestConfig.GetInt("RootTerseUpdatePeriod", RootTerseUpdatePeriod); RootTerseUpdatePeriod = interestConfig.GetInt("RootTerseUpdatePeriod", RootTerseUpdatePeriod);
ChildTerseUpdatePeriod = interestConfig.GetInt("ChildTerseUpdatePeriod", ChildTerseUpdatePeriod); ChildTerseUpdatePeriod = interestConfig.GetInt("ChildTerseUpdatePeriod", ChildTerseUpdatePeriod);
@ -1244,8 +1250,8 @@ namespace OpenSim.Region.Framework.Scenes
RootRotationUpdateTolerance = 0.1f; RootRotationUpdateTolerance = 0.1f;
RootVelocityUpdateTolerance = 0.001f; RootVelocityUpdateTolerance = 0.001f;
RootPositionUpdateTolerance = 0.05f; RootPositionUpdateTolerance = 0.05f;
RootReprioritizationDistance = 10.0; RootReprioritizationDistance = m_minReprioritizationDistance;
ChildReprioritizationDistance = 20.0; ChildReprioritizationDistance = m_minReprioritizationDistance;
m_eventManager = new EventManager(); m_eventManager = new EventManager();

2
OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs
View File

@ -225,7 +225,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
// FIXME: This can only come from the console at the moment but might not always be true. // FIXME: This can only come from the console at the moment but might not always be true.
if (ConsoleUtil.TryParseConsoleDouble(MainConsole.Instance, options["child-repri"], out newValue)) if (ConsoleUtil.TryParseConsoleDouble(MainConsole.Instance, options["child-repri"], out newValue))
m_scene.ChildReprioritizationDistance = newValue; m_scene.ChildReprioritizationDistance = (float)newValue;
} }
if (options.ContainsKey("client-pos-upd")) if (options.ContainsKey("client-pos-upd"))