aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6020a9e..dd4bbe9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1328,6 +1328,11 @@ namespace OpenSim.Region.Framework.Scenes
1328 1328
1329 m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName); 1329 m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName);
1330 1330
1331 // Reset the m_originRegionID as it has dual use as a flag to signal that the UpdateAgent() call orignating
1332 // from the source simulator has completed on a V2 teleport.
1333 lock (m_originRegionIDAccessLock)
1334 m_originRegionID = UUID.Zero;
1335
1331 // Reset these so that teleporting in and walking out isn't seen 1336 // Reset these so that teleporting in and walking out isn't seen
1332 // as teleporting back 1337 // as teleporting back
1333 TeleportFlags = TeleportFlags.Default; 1338 TeleportFlags = TeleportFlags.Default;