aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-10-22 23:35:07 +0100
committerJustin Clark-Casey (justincc)2010-10-22 23:35:07 +0100
commit21187f459ea2ae590dda4249fa15ebf116d04fe0 (patch)
tree48cfec3b73bdbf54f7bc22059044b92271deedc1 /OpenSim/Region/Framework/Scenes/Scene.cs
parentRevert "* refactor refactor refactor ServerURI 4 lyfe" (diff)
parentMerge branch 'hg16' into mantis5110 (diff)
downloadopensim-SC-21187f459ea2ae590dda4249fa15ebf116d04fe0.zip
opensim-SC-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.gz
opensim-SC-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.bz2
opensim-SC-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.xz
Merge remote branch 'otakup0pe/mantis5110'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c9ae558..ef18d02 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3738,9 +3738,12 @@ 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");
3741 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); 3742 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
3743 m_log.Debug("ICADU -> post wait");
3742 if (childAgentUpdate != null) 3744 if (childAgentUpdate != null)
3743 { 3745 {
3746 m_log.Debug("ICADU -> not child agent!");
3744 childAgentUpdate.ChildAgentDataUpdate(cAgentData); 3747 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
3745 return true; 3748 return true;
3746 } 3749 }
@@ -3756,7 +3759,7 @@ namespace OpenSim.Region.Framework.Scenes
3756 /// <returns>true if we handled it.</returns> 3759 /// <returns>true if we handled it.</returns>
3757 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) 3760 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
3758 { 3761 {
3759 //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); 3762 m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
3760 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); 3763 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
3761 if (childAgentUpdate != null) 3764 if (childAgentUpdate != null)
3762 { 3765 {