diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:52:07 +0100 |
commit | fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075 (patch) | |
tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Merge remote branch 'otakup0pe/mantis5110' (diff) | |
download | opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.zip opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.gz opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.bz2 opensim-SC-fe8d3d5a2bc0ddbc051d8a7ad2412da5f3546075.tar.xz |
Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 68ac178..13d9964 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,8 +2976,6 @@ 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 | |||
2981 | cAgent.AgentID = UUID; | 2979 | cAgent.AgentID = UUID; |
2982 | cAgent.RegionID = Scene.RegionInfo.RegionID; | 2980 | cAgent.RegionID = Scene.RegionInfo.RegionID; |
2983 | 2981 | ||