aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-21 23:22:15 -0400
committerJonathan Freedman2010-10-21 23:22:15 -0400
commitd4144bedb81346301162f1e20266561fea7b621e (patch)
treef33876acc79e1a5b688d95cc41628446d70297fa /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
downloadopensim-SC_OLD-d4144bedb81346301162f1e20266561fea7b621e.zip
opensim-SC_OLD-d4144bedb81346301162f1e20266561fea7b621e.tar.gz
opensim-SC_OLD-d4144bedb81346301162f1e20266561fea7b621e.tar.bz2
opensim-SC_OLD-d4144bedb81346301162f1e20266561fea7b621e.tar.xz
* change the data exchanged within hypergrid transactions
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0cfc235..2750168 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3740,9 +3740,12 @@ namespace OpenSim.Region.Framework.Scenes
3740 3740
3741 // We have to wait until the viewer contacts this region after receiving EAC. 3741 // We have to wait until the viewer contacts this region after receiving EAC.
3742 // That calls AddNewClient, which finally creates the ScenePresence 3742 // That calls AddNewClient, which finally creates the ScenePresence
3743 m_log.Debug("ICADU -> pre wait");
3743 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); 3744 ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
3745 m_log.Debug("ICADU -> post wait");
3744 if (childAgentUpdate != null) 3746 if (childAgentUpdate != null)
3745 { 3747 {
3748 m_log.Debug("ICADU -> not child agent!");
3746 childAgentUpdate.ChildAgentDataUpdate(cAgentData); 3749 childAgentUpdate.ChildAgentDataUpdate(cAgentData);
3747 return true; 3750 return true;
3748 } 3751 }
@@ -3758,7 +3761,7 @@ namespace OpenSim.Region.Framework.Scenes
3758 /// <returns>true if we handled it.</returns> 3761 /// <returns>true if we handled it.</returns>
3759 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData) 3762 public virtual bool IncomingChildAgentDataUpdate(AgentPosition cAgentData)
3760 { 3763 {
3761 //m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName); 3764 m_log.Debug(" XXX Scene IncomingChildAgentDataUpdate POSITION in " + RegionInfo.RegionName);
3762 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); 3765 ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
3763 if (childAgentUpdate != null) 3766 if (childAgentUpdate != null)
3764 { 3767 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c223b4b..68ac178 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