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.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3343d08..3c6bab8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3756,9 +3756,12 @@ namespace OpenSim.Region.Framework.Scenes
3756 3756
3757 // We have to wait until the viewer contacts this region after receiving EAC. 3757 // We have to wait until the viewer contacts this region after receiving EAC.
3758 // That calls AddNewClient, which finally creates the ScenePresence 3758 // That calls AddNewClient, which finally creates the ScenePresence
3759 m_log.Debug("ICADU -> pre wait");
3759 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); 3760 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
3761 m_log.Debug("ICADU -> post wait");
3760 if (childAgentUpdate != null) 3762 if (childAgentUpdate != null)
3761 { 3763 {
3764 m_log.Debug("ICADU -> not child agent!");
3762 childAgentUpdate.ChildAgentDataUpdate(cAgentData); 3765 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
3763 return true; 3766 return true;
3764 } 3767 }
@@ -3774,7 +3777,7 @@ namespace OpenSim.Region.Framework.Scenes
3774 /// <returns>true if we handled it.</returns> 3777 /// <returns>true if we handled it.</returns>
3775 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) 3778 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
3776 { 3779 {
3777 //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); 3780 m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
3778 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); 3781 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
3779 if (childAgentUpdate != null) 3782 if (childAgentUpdate != null)
3780 { 3783 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 52e7462..8aa507f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2878,7 +2878,7 @@ namespace OpenSim.Region.Framework.Scenes
2878 2878
2879 public void ChildAgentDataUpdate(AgentData cAgentData) 2879 public void ChildAgentDataUpdate(AgentData cAgentData)
2880 { 2880 {
2881 //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); 2881 m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName);
2882 if (!IsChildAgent) 2882 if (!IsChildAgent)
2883 return; 2883 return;
2884 2884