aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2014-01-11 21:59:22 -0800
committerRobert Adams2014-01-11 21:59:22 -0800
commit3760d10cd071283be243d35e2a9e37d52ef23dd5 (patch)
tree89d1fdc64bd7bcc60e696a7dc952fab811b241a8
parentMerge branch 'master' into varregion (diff)
downloadopensim-SC_OLD-3760d10cd071283be243d35e2a9e37d52ef23dd5.zip
opensim-SC_OLD-3760d10cd071283be243d35e2a9e37d52ef23dd5.tar.gz
opensim-SC_OLD-3760d10cd071283be243d35e2a9e37d52ef23dd5.tar.bz2
opensim-SC_OLD-3760d10cd071283be243d35e2a9e37d52ef23dd5.tar.xz
varregion: remove unnecessary border checking code in ScenePresence.
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b52f48c..d2c7c76 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1076,6 +1076,10 @@ namespace OpenSim.Region.Framework.Scenes
1076 // before the inventory is processed in MakeRootAgent. This fixes a race condition 1076 // before the inventory is processed in MakeRootAgent. This fixes a race condition
1077 // related to the handling of attachments 1077 // related to the handling of attachments
1078 //m_scene.GetAvatarAppearance(ControllingClient, out Appearance); 1078 //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
1079
1080 /* RA 20140111: Commented out these TestBorderCross's.
1081 * Not sure why this code is here. It is not checking all the borders
1082 * and 'in region' sanity checking is done in CheckAndAdjustLandingPoint and below.
1079 if (m_scene.TestBorderCross(pos, Cardinals.E)) 1083 if (m_scene.TestBorderCross(pos, Cardinals.E))
1080 { 1084 {
1081 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); 1085 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
@@ -1087,6 +1091,7 @@ namespace OpenSim.Region.Framework.Scenes
1087 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N); 1091 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
1088 pos.Y = crossedBorder.BorderLine.Z - 1; 1092 pos.Y = crossedBorder.BorderLine.Z - 1;
1089 } 1093 }
1094 */
1090 1095
1091 CheckAndAdjustLandingPoint(ref pos); 1096 CheckAndAdjustLandingPoint(ref pos);
1092 1097
@@ -4667,6 +4672,7 @@ namespace OpenSim.Region.Framework.Scenes
4667 } 4672 }
4668 } 4673 }
4669 4674
4675 // Modify landing point based on possible banning, telehubs or parcel restrictions.
4670 private void CheckAndAdjustLandingPoint(ref Vector3 pos) 4676 private void CheckAndAdjustLandingPoint(ref Vector3 pos)
4671 { 4677 {
4672 string reason; 4678 string reason;