diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6367fcf..f77fb2c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3749,9 +3749,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
3749 | 3749 | ||
3750 | // We have to wait until the viewer contacts this region after receiving EAC. | 3750 | // We have to wait until the viewer contacts this region after receiving EAC. |
3751 | // That calls AddNewClient, which finally creates the ScenePresence | 3751 | // That calls AddNewClient, which finally creates the ScenePresence |
3752 | m_log.Debug("ICADU -> pre wait"); | ||
3752 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 3753 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
3754 | m_log.Debug("ICADU -> post wait"); | ||
3753 | if (childAgentUpdate != null) | 3755 | if (childAgentUpdate != null) |
3754 | { | 3756 | { |
3757 | m_log.Debug("ICADU -> not child agent!"); | ||
3755 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); | 3758 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); |
3756 | return true; | 3759 | return true; |
3757 | } | 3760 | } |
@@ -3767,7 +3770,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3767 | /// <returns>true if we handled it.</returns> | 3770 | /// <returns>true if we handled it.</returns> |
3768 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) | 3771 | public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) |
3769 | { | 3772 | { |
3770 | //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); | 3773 | m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); |
3771 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); | 3774 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); |
3772 | if (childAgentUpdate != null) | 3775 | if (childAgentUpdate != null) |
3773 | { | 3776 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f828a2d..1abd134 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2846,7 +2846,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2846 | 2846 | ||
2847 | public void ChildAgentDataUpdate(AgentData cAgentData) | 2847 | public void ChildAgentDataUpdate(AgentData cAgentData) |
2848 | { | 2848 | { |
2849 | //m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); | 2849 | m_log.Debug(" >>> ChildAgentDataUpdate <<< " + Scene.RegionInfo.RegionName); |
2850 | if (!IsChildAgent) | 2850 | if (!IsChildAgent) |
2851 | return; | 2851 | return; |
2852 | 2852 | ||
@@ -2897,9 +2897,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2897 | 2897 | ||
2898 | public void CopyTo(AgentData cAgent) | 2898 | public void CopyTo(AgentData cAgent) |
2899 | { | 2899 | { |
2900 | // DEBUG ON | 2900 | cAgent.CallbackURI = m_callbackURI; |
2901 | m_log.ErrorFormat("[SCENEPRESENCE] CALLING COPYTO"); | 2901 | |
2902 | // DEBUG OFF | ||
2903 | cAgent.AgentID = UUID; | 2902 | cAgent.AgentID = UUID; |
2904 | cAgent.RegionID = Scene.RegionInfo.RegionID; | 2903 | cAgent.RegionID = Scene.RegionInfo.RegionID; |
2905 | 2904 | ||