diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4fc2cbc..55fca9b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3743,8 +3743,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
3743 | } | 3743 | } |
3744 | 3744 | ||
3745 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 3745 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
3746 | m_log.Debug("ICADU -> post wait"); | ||
3746 | if (childAgentUpdate != null) | 3747 | if (childAgentUpdate != null) |
3747 | { | 3748 | { |
3749 | m_log.Debug("ICADU -> not child agent!"); | ||
3748 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); | 3750 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); |
3749 | return true; | 3751 | return true; |
3750 | } | 3752 | } |
@@ -3760,7 +3762,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3760 | /// <returns>true if we handled it.</returns> | 3762 | /// <returns>true if we handled it.</returns> |
3761 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) | 3763 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) |
3762 | { | 3764 | { |
3763 | //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); | 3765 | m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); |
3764 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); | 3766 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); |
3765 | if (childAgentUpdate != null) | 3767 | if (childAgentUpdate != null) |
3766 | { | 3768 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index db69093..4526a59 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2885,7 +2885,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2885 | 2885 | ||
2886 | public void ChildAgentDataUpdate(AgentData cAgentData) | 2886 | public void ChildAgentDataUpdate(AgentData cAgentData) |
2887 | { | 2887 | { |
2888 | //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); | 2888 | m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); |
2889 | if (!IsChildAgent) | 2889 | if (!IsChildAgent) |
2890 | return; | 2890 | return; |
2891 | 2891 | ||