aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-30 21:23:57 +0100
committerJustin Clark-Casey (justincc)2010-06-30 21:23:57 +0100
commit92edbd3e4745ea9007cf6ae42a38fbcd653cc848 (patch)
treeb30f465a93ece041a71494c9c25eee3bfe28ef0e /OpenSim/Region/Framework
parentRevert "stop exceptions in setting and getting state from propogating since t... (diff)
downloadopensim-SC_OLD-92edbd3e4745ea9007cf6ae42a38fbcd653cc848.zip
opensim-SC_OLD-92edbd3e4745ea9007cf6ae42a38fbcd653cc848.tar.gz
opensim-SC_OLD-92edbd3e4745ea9007cf6ae42a38fbcd653cc848.tar.bz2
opensim-SC_OLD-92edbd3e4745ea9007cf6ae42a38fbcd653cc848.tar.xz
If an emergency pos is required for a new root agent, correctly preserve the z co-ord instead of accidentally resetting the incorrect x co-ord
This is a one-liner. It has already been addressed in master and 0.7-post-fixes in a more extensive way
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 51cdf1b..8a633b5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -839,7 +839,7 @@ namespace OpenSim.Region.Framework.Scenes
839 if (!(pos.Y < 0)) 839 if (!(pos.Y < 0))
840 emergencyPos.Y = pos.Y; 840 emergencyPos.Y = pos.Y;
841 if (!(pos.Z < 0)) 841 if (!(pos.Z < 0))
842 emergencyPos.X = pos.X; 842 emergencyPos.Z = pos.Z;
843 } 843 }
844 if (pos.Y < 0) 844 if (pos.Y < 0)
845 { 845 {
@@ -857,7 +857,7 @@ namespace OpenSim.Region.Framework.Scenes
857 emergencyPos.Y = pos.Y; 857 emergencyPos.Y = pos.Y;
858 //Leave as 128 858 //Leave as 128
859 } 859 }
860 860
861 m_log.WarnFormat( 861 m_log.WarnFormat(
862 "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}", 862 "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
863 pos, Name, UUID, emergencyPos); 863 pos, Name, UUID, emergencyPos);