diff options
author | UbitUmarov | 2014-08-18 19:41:16 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-18 19:41:16 +0100 |
commit | d31f361e8900aebb27f220bf0120dec5eb14c78a (patch) | |
tree | 22a610135c657fb07044c066f5d9187268555a90 /OpenSim/Region/Framework | |
parent | missing file for previus commit (diff) | |
download | opensim-SC_OLD-d31f361e8900aebb27f220bf0120dec5eb14c78a.zip opensim-SC_OLD-d31f361e8900aebb27f220bf0120dec5eb14c78a.tar.gz opensim-SC_OLD-d31f361e8900aebb27f220bf0120dec5eb14c78a.tar.bz2 opensim-SC_OLD-d31f361e8900aebb27f220bf0120dec5eb14c78a.tar.xz |
moved hacks to scene presence completemovement, possible only needed
there?
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index dc3f57a..0266faf 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3903,16 +3903,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3903 | 3903 | ||
3904 | sp.LifecycleState = ScenePresenceState.Running; | 3904 | sp.LifecycleState = ScenePresenceState.Running; |
3905 | 3905 | ||
3906 | |||
3907 | //HACK part A | ||
3908 | // kill in viewers sp.localID that they may still know about | ||
3909 | |||
3910 | SendKillObject(new List<uint> { sp.LocalId }); | ||
3911 | |||
3912 | //HACK part B | ||
3913 | // keep using same localID | ||
3914 | |||
3915 | |||
3916 | if (EntityTransferModule.IsInTransit(sp.UUID)) | 3906 | if (EntityTransferModule.IsInTransit(sp.UUID)) |
3917 | { | 3907 | { |
3918 | sp.DoNotCloseAfterTeleport = true; | 3908 | sp.DoNotCloseAfterTeleport = true; |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3c7e4a2..1ace0d9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1767,10 +1767,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
1767 | // Make sure it's not a login agent. We don't want to wait for updates during login | 1767 | // Make sure it's not a login agent. We don't want to wait for updates during login |
1768 | if (!isNPC && (m_teleportFlags & TeleportFlags.ViaLogin) == 0) | 1768 | if (!isNPC && (m_teleportFlags & TeleportFlags.ViaLogin) == 0) |
1769 | { | 1769 | { |
1770 | |||
1770 | // Let's wait until UpdateAgent (called by departing region) is done | 1771 | // Let's wait until UpdateAgent (called by departing region) is done |
1771 | if (!WaitForUpdateAgent(client)) | 1772 | if (!WaitForUpdateAgent(client)) |
1772 | // The sending region never sent the UpdateAgent data, we have to refuse | 1773 | // The sending region never sent the UpdateAgent data, we have to refuse |
1773 | return; | 1774 | return; |
1775 | |||
1776 | //HACK part A | ||
1777 | // kill in viewers sp.localID that they may still know about | ||
1778 | m_log.DebugFormat("[CompleteMovement] send old child kills"); | ||
1779 | m_scene.SendKillObject(new List<uint> { LocalId }); | ||
1780 | |||
1781 | //HACK part B | ||
1782 | // keep using same localID | ||
1783 | |||
1774 | } | 1784 | } |
1775 | 1785 | ||
1776 | // Prevent teleporting to an underground location | 1786 | // Prevent teleporting to an underground location |