diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 4878b3e..3dd0f3a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3738,12 +3738,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3738 | 3738 | ||
3739 | // We have to wait until the viewer contacts this region after receiving EAC. | 3739 | // We have to wait until the viewer contacts this region after receiving EAC. |
3740 | // That calls AddNewClient, which finally creates the ScenePresence | 3740 | // That calls AddNewClient, which finally creates the ScenePresence |
3741 | m_log.Debug("ICADU -> pre wait"); | ||
3742 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 3741 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
3743 | m_log.Debug("ICADU -> post wait"); | ||
3744 | if (childAgentUpdate != null) | 3742 | if (childAgentUpdate != null) |
3745 | { | 3743 | { |
3746 | m_log.Debug("ICADU -> not child agent!"); | ||
3747 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); | 3744 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); |
3748 | return true; | 3745 | return true; |
3749 | } | 3746 | } |
@@ -3759,7 +3756,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3759 | /// <returns>true if we handled it.</returns> | 3756 | /// <returns>true if we handled it.</returns> |
3760 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) | 3757 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) |
3761 | { | 3758 | { |
3762 | m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); | 3759 | //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); |
3763 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); | 3760 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); |
3764 | if (childAgentUpdate != null) | 3761 | if (childAgentUpdate != null) |
3765 | { | 3762 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 68ac178..13d9964 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2925,7 +2925,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2925 | 2925 | ||
2926 | public void ChildAgentDataUpdate(AgentData cAgentData) | 2926 | public void ChildAgentDataUpdate(AgentData cAgentData) |
2927 | { | 2927 | { |
2928 | m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); | 2928 | //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); |
2929 | if (!IsChildAgent) | 2929 | if (!IsChildAgent) |
2930 | return; | 2930 | return; |
2931 | 2931 | ||
@@ -2976,8 +2976,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2976 | 2976 | ||
2977 | public void CopyTo(AgentData cAgent) | 2977 | public void CopyTo(AgentData cAgent) |
2978 | { | 2978 | { |
2979 | cAgent.CallbackURI = m_callbackURI; | ||
2980 | |||
2981 | cAgent.AgentID = UUID; | 2979 | cAgent.AgentID = UUID; |
2982 | cAgent.RegionID = Scene.RegionInfo.RegionID; | 2980 | cAgent.RegionID = Scene.RegionInfo.RegionID; |
2983 | 2981 | ||