aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2014-07-24 00:58:23 +0100
committerUbitUmarov2014-07-24 00:58:23 +0100
commit6c3e08e18d575060c72bd7297d9672482e48135f (patch)
tree482214ab0821a229617d0f0eac437d20432cf851 /OpenSim/Region
parenton transfer fail of sited avatars, only do (diff)
downloadopensim-SC-6c3e08e18d575060c72bd7297d9672482e48135f.zip
opensim-SC-6c3e08e18d575060c72bd7297d9672482e48135f.tar.gz
opensim-SC-6c3e08e18d575060c72bd7297d9672482e48135f.tar.bz2
opensim-SC-6c3e08e18d575060c72bd7297d9672482e48135f.tar.xz
revert my change of not adding physcis to a failed avatar transfer. This
may need a better fix later ( doing a stand elsewhere?)
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs3
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 b497e2f..8189864 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1680,9 +1680,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1680 neighbourRegion.RegionName, agent.Name); 1680 neighbourRegion.RegionName, agent.Name);
1681 1681
1682 ReInstantiateScripts(agent); 1682 ReInstantiateScripts(agent);
1683 if (agent.ParentUUID != UUID.Zero && agent.ParentID == 0)
1684 return false;
1685
1686 agent.AddToPhysicalScene(isFlying); 1683 agent.AddToPhysicalScene(isFlying);
1687 1684
1688 return false; 1685 return false;