diff options
author | Melanie | 2010-06-09 16:48:37 +0100 |
---|---|---|
committer | Melanie | 2010-06-09 16:48:37 +0100 |
commit | 6b2d2413f7026c41e7abb55c72c583670cb6011d (patch) | |
tree | 6596f0132d36f74f2e57c9b1bd891d95eb0e5a33 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Add the BEGIN; I had missed (diff) | |
download | opensim-SC-6b2d2413f7026c41e7abb55c72c583670cb6011d.zip opensim-SC-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.gz opensim-SC-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.bz2 opensim-SC-6b2d2413f7026c41e7abb55c72c583670cb6011d.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 66c5a72..266621f 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -869,9 +869,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
869 | 869 | ||
870 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); | 870 | CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); |
871 | 871 | ||
872 | // m_scene.SendKillObject(m_localId); | ||
873 | |||
874 | agent.Scene.NotifyMyCoarseLocationChange(); | ||
875 | // the user may change their profile information in other region, | 872 | // the user may change their profile information in other region, |
876 | // so the userinfo in UserProfileCache is not reliable any more, delete it | 873 | // so the userinfo in UserProfileCache is not reliable any more, delete it |
877 | // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE! | 874 | // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE! |