diff options
author | Justin Clarke Casey | 2009-01-16 21:56:13 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-16 21:56:13 +0000 |
commit | eca6442bae4093019bd221e87413c74c77c4ff5d (patch) | |
tree | e62245b1cf2a5f0afdde443fba38c2b62d401100 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | * minor: Future archiver test stub (diff) | |
download | opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.zip opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.gz opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.bz2 opensim-SC_OLD-eca6442bae4093019bd221e87413c74c77c4ff5d.tar.xz |
* Rig up enough infrastructure to actually perform a successful 'standalone' teleport unit test with checks that the scene presence disappeared from sceneA and appeared in
sceneB
* However, I'm not convinced that the actual process in the test completely reflects reality, and a lot of stuff had to be rigged up (which should get resolved over time)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index bdb0836..77d5b93 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1017,9 +1017,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1017 | 1017 | ||
1018 | if ((m_callbackURI != null) && !m_callbackURI.Equals("")) | 1018 | if ((m_callbackURI != null) && !m_callbackURI.Equals("")) |
1019 | { | 1019 | { |
1020 | //m_log.DebugFormat("Found callback URI {0}", m_callbackURI); | ||
1020 | Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI); | 1021 | Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI); |
1021 | m_callbackURI = null; | 1022 | m_callbackURI = null; |
1022 | } | 1023 | } |
1024 | |||
1025 | //m_log.DebugFormat("Completed movement"); | ||
1023 | } | 1026 | } |
1024 | } | 1027 | } |
1025 | 1028 | ||
@@ -2594,7 +2597,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2594 | /// </summary> | 2597 | /// </summary> |
2595 | public void ChildAgentDataUpdate(AgentPosition cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) | 2598 | public void ChildAgentDataUpdate(AgentPosition cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY) |
2596 | { | 2599 | { |
2597 | // | ||
2598 | if (!IsChildAgent) | 2600 | if (!IsChildAgent) |
2599 | return; | 2601 | return; |
2600 | 2602 | ||
@@ -2615,7 +2617,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2615 | if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) | 2617 | if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) |
2616 | ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); | 2618 | ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); |
2617 | 2619 | ||
2618 | |||
2619 | // Sends out the objects in the user's draw distance if m_sendTasksToChild is true. | 2620 | // Sends out the objects in the user's draw distance if m_sendTasksToChild is true. |
2620 | if (m_scene.m_seeIntoRegionFromNeighbor) | 2621 | if (m_scene.m_seeIntoRegionFromNeighbor) |
2621 | m_pendingObjects = null; | 2622 | m_pendingObjects = null; |
@@ -2662,7 +2663,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2662 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; | 2663 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; |
2663 | } | 2664 | } |
2664 | 2665 | ||
2665 | |||
2666 | cAgent.GodLevel = (byte)m_godlevel; | 2666 | cAgent.GodLevel = (byte)m_godlevel; |
2667 | cAgent.AlwaysRun = m_setAlwaysRun; | 2667 | cAgent.AlwaysRun = m_setAlwaysRun; |
2668 | 2668 | ||