aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authoropensim mirror account2010-10-22 16:00:06 -0700
committeropensim mirror account2010-10-22 16:00:06 -0700
commitbf5cc32b5f87de786ea764021571b2bdcf1e64cd (patch)
tree86f05bdff474bc42ee90a7e1d3dcfc508ab2bc04 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.zip
opensim-SC-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.gz
opensim-SC-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.bz2
opensim-SC-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
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