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 way0.6.9-post-fixes
parent
cabb70d90a
commit
92edbd3e47
|
@ -839,7 +839,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
if (!(pos.Y < 0))
|
if (!(pos.Y < 0))
|
||||||
emergencyPos.Y = pos.Y;
|
emergencyPos.Y = pos.Y;
|
||||||
if (!(pos.Z < 0))
|
if (!(pos.Z < 0))
|
||||||
emergencyPos.X = pos.X;
|
emergencyPos.Z = pos.Z;
|
||||||
}
|
}
|
||||||
if (pos.Y < 0)
|
if (pos.Y < 0)
|
||||||
{
|
{
|
||||||
|
@ -857,7 +857,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
emergencyPos.Y = pos.Y;
|
emergencyPos.Y = pos.Y;
|
||||||
//Leave as 128
|
//Leave as 128
|
||||||
}
|
}
|
||||||
|
|
||||||
m_log.WarnFormat(
|
m_log.WarnFormat(
|
||||||
"[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
|
"[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
|
||||||
pos, Name, UUID, emergencyPos);
|
pos, Name, UUID, emergencyPos);
|
||||||
|
|
Loading…
Reference in New Issue