aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-05 17:01:31 -0800
committerJohn Hurliman2010-03-05 17:01:31 -0800
commitcde3c20ba3f4f506fc69d3db54171f88223219aa (patch)
treeec124789f5044e01f5713598842375307f997ed2 /OpenSim
parentBug fix on user account creation -- ServiceURLs field now properly filled out. (diff)
downloadopensim-SC_OLD-cde3c20ba3f4f506fc69d3db54171f88223219aa.zip
opensim-SC_OLD-cde3c20ba3f4f506fc69d3db54171f88223219aa.tar.gz
opensim-SC_OLD-cde3c20ba3f4f506fc69d3db54171f88223219aa.tar.bz2
opensim-SC_OLD-cde3c20ba3f4f506fc69d3db54171f88223219aa.tar.xz
* Fixed an order of operations bug in CheckForSignificantMovement() that was causing a flood of child updates to neighbors on login
* Removed an unnecessary call to the presence service
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 465e916..4256be9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2675,6 +2675,9 @@ namespace OpenSim.Region.Framework.Scenes
2675 if (Util.GetDistanceTo(AbsolutePosition, m_lastChildAgentUpdatePosition) >= Scene.ChildReprioritizationDistance || 2675 if (Util.GetDistanceTo(AbsolutePosition, m_lastChildAgentUpdatePosition) >= Scene.ChildReprioritizationDistance ||
2676 Util.GetDistanceTo(CameraPosition, m_lastChildAgentUpdateCamPosition) >= Scene.ChildReprioritizationDistance) 2676 Util.GetDistanceTo(CameraPosition, m_lastChildAgentUpdateCamPosition) >= Scene.ChildReprioritizationDistance)
2677 { 2677 {
2678 m_lastChildAgentUpdatePosition = AbsolutePosition;
2679 m_lastChildAgentUpdateCamPosition = CameraPosition;
2680
2678 ChildAgentDataUpdate cadu = new ChildAgentDataUpdate(); 2681 ChildAgentDataUpdate cadu = new ChildAgentDataUpdate();
2679 cadu.ActiveGroupID = UUID.Zero.Guid; 2682 cadu.ActiveGroupID = UUID.Zero.Guid;
2680 cadu.AgentID = UUID.Guid; 2683 cadu.AgentID = UUID.Guid;
@@ -2683,8 +2686,6 @@ namespace OpenSim.Region.Framework.Scenes
2683 Vector3 tempCameraCenter = m_CameraCenter; 2686 Vector3 tempCameraCenter = m_CameraCenter;
2684 cadu.cameraPosition = tempCameraCenter; 2687 cadu.cameraPosition = tempCameraCenter;
2685 cadu.drawdistance = m_DrawDistance; 2688 cadu.drawdistance = m_DrawDistance;
2686 if (m_scene.Permissions.IsGod(new UUID(cadu.AgentID)))
2687 cadu.godlevel = m_godlevel;
2688 cadu.GroupAccess = 0; 2689 cadu.GroupAccess = 0;
2689 cadu.Position = AbsolutePosition; 2690 cadu.Position = AbsolutePosition;
2690 cadu.regionHandle = m_rootRegionHandle; 2691 cadu.regionHandle = m_rootRegionHandle;
@@ -2707,9 +2708,6 @@ namespace OpenSim.Region.Framework.Scenes
2707 agentpos.CopyFrom(cadu); 2708 agentpos.CopyFrom(cadu);
2708 2709
2709 m_scene.SendOutChildAgentUpdates(agentpos, this); 2710 m_scene.SendOutChildAgentUpdates(agentpos, this);
2710
2711 m_lastChildAgentUpdatePosition = AbsolutePosition;
2712 m_lastChildAgentUpdateCamPosition = CameraPosition;
2713 } 2711 }
2714 } 2712 }
2715 2713