diff options
| author | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-22 23:35:07 +0100 |
| commit | 21187f459ea2ae590dda4249fa15ebf116d04fe0 (patch) | |
| tree | 48cfec3b73bdbf54f7bc22059044b92271deedc1 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Revert "* refactor refactor refactor ServerURI 4 lyfe" (diff) | |
| parent | Merge branch 'hg16' into mantis5110 (diff) | |
| download | opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.zip opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.gz opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.bz2 opensim-SC_OLD-21187f459ea2ae590dda4249fa15ebf116d04fe0.tar.xz | |
Merge remote branch 'otakup0pe/mantis5110'
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 3 insertions, 1 deletions
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 | ||