diff options
author | Diva Canto | 2014-07-04 10:13:53 -0700 |
---|---|---|
committer | Diva Canto | 2014-07-04 10:13:53 -0700 |
commit | d99c8e68a701902feb717e15f06fc777a99708b6 (patch) | |
tree | 219d14b84e4289eb6bc51a762bdae2dbeaa5c3f3 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-d99c8e68a701902feb717e15f06fc777a99708b6.zip opensim-SC_OLD-d99c8e68a701902feb717e15f06fc777a99708b6.tar.gz opensim-SC_OLD-d99c8e68a701902feb717e15f06fc777a99708b6.tar.bz2 opensim-SC_OLD-d99c8e68a701902feb717e15f06fc777a99708b6.tar.xz |
It turns out that child agent management has had a bug for a while: there was an inconsistency in the scope between opening and closing child agents in neighboring regions. For opening (in EnableChildAgents), the region's DrawDistance was being used; for closing (in IsOUtsideView) , the viewer's (SP) DrawDistance was being used. This fixes this inconsistency, therefore eliminating bugs observed in TPs between, at least, neighboring varregions.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 063ac73..20c88e1 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3734,7 +3734,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3734 | 3734 | ||
3735 | // m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX))); | 3735 | // m_log.Debug("---> x: " + x + "; newx:" + newRegionX + "; Abs:" + (int)Math.Abs((int)(x - newRegionX))); |
3736 | // m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY))); | 3736 | // m_log.Debug("---> y: " + y + "; newy:" + newRegionY + "; Abs:" + (int)Math.Abs((int)(y - newRegionY))); |
3737 | if (Util.IsOutsideView(DrawDistance, x, newRegionX, y, newRegionY)) | 3737 | float dist = (float)Math.Max(Scene.DefaultDrawDistance, |
3738 | (float)Math.Max(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY)); | ||
3739 | if (Util.IsOutsideView(dist, x, newRegionX, y, newRegionY)) | ||
3738 | { | 3740 | { |
3739 | byebyeRegions.Add(handle); | 3741 | byebyeRegions.Add(handle); |
3740 | } | 3742 | } |