Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-10-23 00:21:42 +0100
committer: Melanie 2010-10-23 00:21:42 +0100
commit: 7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e (patch)
tree: 73f156f1f7dc7d199a946d351828c7e725ebfbda /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parent: Change some exception to use ToString(). e.Message is not sufficient to fix (diff)
parent: Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download: opensim-SC_OLD-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.zip
opensim-SC_OLD-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.gz
opensim-SC_OLD-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.bz2
opensim-SC_OLD-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.xz
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 06e3c0e..618f425 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3329,8 +3329,6 @@ namespace OpenSim.Region.Framework.Scenes
        public void CopyTo(AgentData cAgent)
        {
-            cAgent.CallbackURI = m_callbackURI;
-            
            cAgent.AgentID = UUID;
            cAgent.RegionID = Scene.RegionInfo.RegionID;
author	Melanie	2010-10-23 00:21:42 +0100
committer	Melanie	2010-10-23 00:21:42 +0100
commit	7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e (patch)
tree	73f156f1f7dc7d199a946d351828c7e725ebfbda /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parent	Change some exception to use ToString(). e.Message is not sufficient to fix (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC_OLD-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.zip opensim-SC_OLD-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.gz opensim-SC_OLD-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.bz2 opensim-SC_OLD-7f74dc1b14d3ef31a9f20bb3a76ef8d587779f7e.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 06e3c0e..618f425 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3329,8 +3329,6 @@ namespace OpenSim.Region.Framework.Scenes
3329		3329
3330	public void CopyTo(AgentData cAgent)	3330	public void CopyTo(AgentData cAgent)
3331	{	3331	{
3332	cAgent.CallbackURI = m_callbackURI;
3333
3334	cAgent.AgentID = UUID;	3332	cAgent.AgentID = UUID;
3335	cAgent.RegionID = Scene.RegionInfo.RegionID;	3333	cAgent.RegionID = Scene.RegionInfo.RegionID;
3336		3334