aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authordiva2009-02-04 16:31:48 +0000
committerdiva2009-02-04 16:31:48 +0000
commitbe3e676d33dc44c67bd427022badd73395ca5174 (patch)
tree97ebfb2839456bc2dab0595fa4867ec26b024093 /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parentAdded a ForceSceneObjectBackup method to Scene, which as it says forces a dat... (diff)
downloadopensim-SC-be3e676d33dc44c67bd427022badd73395ca5174.zip
opensim-SC-be3e676d33dc44c67bd427022badd73395ca5174.tar.gz
opensim-SC-be3e676d33dc44c67bd427022badd73395ca5174.tar.bz2
opensim-SC-be3e676d33dc44c67bd427022badd73395ca5174.tar.xz
Addresses a race condition that happened between the viewer and the departing region wrt the creation of the child agent in the receiving region, and that resulted in failed TPs.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 7c0df39..ed455f4 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1000,7 +1000,6 @@ namespace OpenSim.Region.Environment.Scenes
1000 /// </summary> 1000 /// </summary>
1001 public void CompleteMovement() 1001 public void CompleteMovement()
1002 { 1002 {
1003 //Console.WriteLine("\n CompleteMovement \n");
1004 Vector3 look = Velocity; 1003 Vector3 look = Velocity;
1005 if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) 1004 if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
1006 { 1005 {
@@ -1017,7 +1016,7 @@ namespace OpenSim.Region.Environment.Scenes
1017 1016
1018 if ((m_callbackURI != null) && !m_callbackURI.Equals("")) 1017 if ((m_callbackURI != null) && !m_callbackURI.Equals(""))
1019 { 1018 {
1020 //m_log.DebugFormat("Found callback URI {0}", m_callbackURI); 1019 m_log.DebugFormat("[SCENE PRESENCE]: Releasing agent in URI {0}", m_callbackURI);
1021 Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI); 1020 Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI);
1022 m_callbackURI = null; 1021 m_callbackURI = null;
1023 } 1022 }