diff options
| author | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-22 18:34:50 -0400 |
| commit | 38e76d71ac8d60ca5228588d154b610857381a1c (patch) | |
| tree | 45a9cccf38765e8b6c41547373bdcaa91d01508f /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Fix llParcelMediaCommandList() so that it applies commands only to the parcel... (diff) | |
| parent | * change the data exchanged within hypergrid transactions (diff) | |
| download | opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.zip opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.gz opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.bz2 opensim-SC_OLD-38e76d71ac8d60ca5228588d154b610857381a1c.tar.xz | |
Merge branch 'hg16' into mantis5110
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
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 | { |