diff options
author | Justin Clark-Casey (justincc) | 2011-10-06 23:47:41 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-06 23:47:41 +0100 |
commit | 4c812884be59d76039afee74725fc45981356f36 (patch) | |
tree | cadeb4f67773717f55d679df45035b8f84d15905 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | WebStats - Home Link Fix (diff) | |
parent | Simplified IsInTransit property on ScenePresence and removed InTransit() whic... (diff) | |
download | opensim-SC_OLD-4c812884be59d76039afee74725fc45981356f36.zip opensim-SC_OLD-4c812884be59d76039afee74725fc45981356f36.tar.gz opensim-SC_OLD-4c812884be59d76039afee74725fc45981356f36.tar.bz2 opensim-SC_OLD-4c812884be59d76039afee74725fc45981356f36.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 8924c0a..083ee33 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -699,7 +699,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
699 | } | 699 | } |
700 | else | 700 | else |
701 | { | 701 | { |
702 | agent.InTransit(); | 702 | agent.IsInTransit = true; |
703 | 703 | ||
704 | neighboury = b.TriggerRegionY; | 704 | neighboury = b.TriggerRegionY; |
705 | neighbourx = b.TriggerRegionX; | 705 | neighbourx = b.TriggerRegionX; |
@@ -722,7 +722,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
722 | } | 722 | } |
723 | else | 723 | else |
724 | { | 724 | { |
725 | agent.InTransit(); | 725 | agent.IsInTransit = true; |
726 | 726 | ||
727 | neighboury = ba.TriggerRegionY; | 727 | neighboury = ba.TriggerRegionY; |
728 | neighbourx = ba.TriggerRegionX; | 728 | neighbourx = ba.TriggerRegionX; |
@@ -756,7 +756,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
756 | } | 756 | } |
757 | else | 757 | else |
758 | { | 758 | { |
759 | agent.InTransit(); | 759 | agent.IsInTransit = true; |
760 | 760 | ||
761 | neighboury = ba.TriggerRegionY; | 761 | neighboury = ba.TriggerRegionY; |
762 | neighbourx = ba.TriggerRegionX; | 762 | neighbourx = ba.TriggerRegionX; |
@@ -788,7 +788,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
788 | } | 788 | } |
789 | else | 789 | else |
790 | { | 790 | { |
791 | agent.InTransit(); | 791 | agent.IsInTransit = true; |
792 | 792 | ||
793 | neighboury = b.TriggerRegionY; | 793 | neighboury = b.TriggerRegionY; |
794 | neighbourx = b.TriggerRegionX; | 794 | neighbourx = b.TriggerRegionX; |
@@ -876,7 +876,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
876 | return false; | 876 | return false; |
877 | } | 877 | } |
878 | 878 | ||
879 | agent.InTransit(); | 879 | agent.IsInTransit = true; |
880 | 880 | ||
881 | CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync; | 881 | CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync; |
882 | d.BeginInvoke(agent, newpos, neighbourx, neighboury, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d); | 882 | d.BeginInvoke(agent, newpos, neighbourx, neighboury, neighbourRegion, isFlying, version, CrossAgentToNewRegionCompleted, d); |
@@ -1066,7 +1066,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1066 | agent.RestoreInCurrentScene(); | 1066 | agent.RestoreInCurrentScene(); |
1067 | 1067 | ||
1068 | // In any case | 1068 | // In any case |
1069 | agent.NotInTransit(); | 1069 | agent.IsInTransit = false; |
1070 | 1070 | ||
1071 | //m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname); | 1071 | //m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname); |
1072 | } | 1072 | } |