aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 66c6924..fcfb4d7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3691,8 +3691,10 @@ namespace OpenSim.Region.Framework.Scenes
3691 } 3691 }
3692 3692
3693 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); 3693 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
3694 m_log.Debug("ICADU -> post wait");
3694 if (childAgentUpdate != null) 3695 if (childAgentUpdate != null)
3695 { 3696 {
3697 m_log.Debug("ICADU -> not child agent!");
3696 childAgentUpdate.ChildAgentDataUpdate(cAgentData); 3698 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
3697 return true; 3699 return true;
3698 } 3700 }
@@ -3708,7 +3710,7 @@ namespace OpenSim.Region.Framework.Scenes
3708 /// <returns>true if we handled it.</returns> 3710 /// <returns>true if we handled it.</returns>
3709 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) 3711 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
3710 { 3712 {
3711 //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); 3713 m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
3712 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); 3714 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
3713 if (childAgentUpdate != null) 3715 if (childAgentUpdate != null)
3714 { 3716 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a1c80e5..d88526f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2933,7 +2933,7 @@ namespace OpenSim.Region.Framework.Scenes
2933 2933
2934 public void ChildAgentDataUpdate(AgentData cAgentData) 2934 public void ChildAgentDataUpdate(AgentData cAgentData)
2935 { 2935 {
2936 //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); 2936 m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName);
2937 if (!IsChildAgent) 2937 if (!IsChildAgent)
2938 return; 2938 return;
2939 2939