Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2010-06-09 03:52:24 +0100
committer: Melanie 2010-06-09 03:52:24 +0100
commit: 796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7 (patch)
tree: 068bd7280922296c764cccfe05e12dcaadc7bd45 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
parent: If a script is deleted before it gets compiled, don't even bother to try (diff)
parent: Refactor SendCoarseLocations for better performance. Instead of computing lis... (diff)
download: opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.zip
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.gz
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.bz2
opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.xz
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 1e3e0c9..0707119 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -865,9 +865,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
-                //                    m_scene.SendKillObject(m_localId);
-                agent.Scene.NotifyMyCoarseLocationChange();
                // the user may change their profile information in other region,
                // so the userinfo in UserProfileCache is not reliable any more, delete it
                // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
author	Melanie	2010-06-09 03:52:24 +0100
committer	Melanie	2010-06-09 03:52:24 +0100
commit	796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7 (patch)
tree	068bd7280922296c764cccfe05e12dcaadc7bd45 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
parent	If a script is deleted before it gets compiled, don't even bother to try (diff)
parent	Refactor SendCoarseLocations for better performance. Instead of computing lis... (diff)
download	opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.zip opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.gz opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.bz2 opensim-SC_OLD-796e9b5cb48f1077f5c6ef85a6b2b0bfe3b907e7.tar.xz

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 1e3e0c9..0707119 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -865,9 +865,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
865		865
866	CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);	866	CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
867		867
868	// m_scene.SendKillObject(m_localId);
869
870	agent.Scene.NotifyMyCoarseLocationChange();
871	// the user may change their profile information in other region,	868	// the user may change their profile information in other region,
872	// so the userinfo in UserProfileCache is not reliable any more, delete it	869	// so the userinfo in UserProfileCache is not reliable any more, delete it
873	// REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!	870	// REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!