diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
commit | fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075 (patch) | |
tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge remote branch 'otakup0pe/mantis5110' (diff) | |
download | opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.zip opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.gz opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.bz2 opensim-SC_OLD-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.xz |
Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ef18d02..c9ae558 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 | { |