aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-05 23:05:12 +0100
committerJustin Clark-Casey (justincc)2013-08-05 23:05:12 +0100
commit76e778fe2ca572d293d1f0559b5ad74644fdc5e2 (patch)
tree59682a2a213ac175b1ca2fe3e190874a9f6002a5 /OpenSim
parentMake it possible to set worker/iocp min/max threadpool limits on the fly with... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-76e778fe2ca572d293d1f0559b5ad74644fdc5e2.zip
opensim-SC_OLD-76e778fe2ca572d293d1f0559b5ad74644fdc5e2.tar.gz
opensim-SC_OLD-76e778fe2ca572d293d1f0559b5ad74644fdc5e2.tar.bz2
opensim-SC_OLD-76e778fe2ca572d293d1f0559b5ad74644fdc5e2.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 456c8cc..0ba2dab 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2989,8 +2989,7 @@ namespace OpenSim.Region.Framework.Scenes
2989 } 2989 }
2990 2990
2991 // Minimum Draw distance is 64 meters, the Radius of the draw distance sphere is 32m 2991 // Minimum Draw distance is 64 meters, the Radius of the draw distance sphere is 32m
2992 if (Util.GetDistanceTo(AbsolutePosition, m_lastChildAgentUpdatePosition) >= Scene.ChildReprioritizationDistance || 2992 if (Util.GetDistanceTo(AbsolutePosition, m_lastChildAgentUpdatePosition) >= Scene.ChildReprioritizationDistance)
2993 Util.GetDistanceTo(CameraPosition, m_lastChildAgentUpdateCamPosition) >= Scene.ChildReprioritizationDistance)
2994 { 2993 {
2995 m_lastChildAgentUpdatePosition = AbsolutePosition; 2994 m_lastChildAgentUpdatePosition = AbsolutePosition;
2996 m_lastChildAgentUpdateCamPosition = CameraPosition; 2995 m_lastChildAgentUpdateCamPosition = CameraPosition;