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/ScenePresence.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/ScenePresence.cs')
| -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 | ||