OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

varregion: remove unnecessary border checking code in ScenePresence.

varregion
Robert Adams 2014-01-11 21:59:22 -08:00
parent 1cf17a3cf7
commit 3760d10cd0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1076,6 +1076,10 @@ namespace OpenSim.Region.Framework.Scenes
// before the inventory is processed in MakeRootAgent. This fixes a race condition // before the inventory is processed in MakeRootAgent. This fixes a race condition
// related to the handling of attachments // related to the handling of attachments
//m_scene.GetAvatarAppearance(ControllingClient, out Appearance); //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
/* RA 20140111: Commented out these TestBorderCross's.
* Not sure why this code is here. It is not checking all the borders
* and 'in region' sanity checking is done in CheckAndAdjustLandingPoint and below.
if (m_scene.TestBorderCross(pos, Cardinals.E)) if (m_scene.TestBorderCross(pos, Cardinals.E))
{ {
Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
@ -1087,6 +1091,7 @@ namespace OpenSim.Region.Framework.Scenes
Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N); Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
pos.Y = crossedBorder.BorderLine.Z - 1; pos.Y = crossedBorder.BorderLine.Z - 1;
} }
*/
CheckAndAdjustLandingPoint(ref pos); CheckAndAdjustLandingPoint(ref pos);
@ -4667,6 +4672,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
// Modify landing point based on possible banning, telehubs or parcel restrictions.
private void CheckAndAdjustLandingPoint(ref Vector3 pos) private void CheckAndAdjustLandingPoint(ref Vector3 pos)
{ {
string reason; string reason;