aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-22 18:34:50 -0400
committerJonathan Freedman2010-10-22 18:34:50 -0400
commit38e76d71ac8d60ca5228588d154b610857381a1c (patch)
tree45a9cccf38765e8b6c41547373bdcaa91d01508f /OpenSim/Region/Framework
parentFix llParcelMediaCommandList() so that it applies commands only to the parcel... (diff)
parent* change the data exchanged within hypergrid transactions (diff)
downloadopensim-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')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
2 files changed, 7 insertions, 2 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 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 13d9964..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
@@ -2976,6 +2976,8 @@ namespace OpenSim.Region.Framework.Scenes
2976 2976
2977 public void CopyTo(AgentData cAgent) 2977 public void CopyTo(AgentData cAgent)
2978 { 2978 {
2979 cAgent.CallbackURI = m_callbackURI;
2980
2979 cAgent.AgentID = UUID; 2981 cAgent.AgentID = UUID;
2980 cAgent.RegionID = Scene.RegionInfo.RegionID; 2982 cAgent.RegionID = Scene.RegionInfo.RegionID;
2981 2983