Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Border.cs b/OpenSim/Region/Framework/Scenes/Border.cs
index c6a6511..08c0c31 100644
--- a/OpenSim/Region/Framework/Scenes/Border.cs
+++ b/OpenSim/Region/Framework/Scenes/Border.cs
@@ -33,8 +33,7 @@ using OpenMetaverse;
 namespace OpenSim.Region.Framework.Scenes
 {
     public class Border
-    {
-        
+    {       
         /// <summary>
         /// Line perpendicular to the Direction Cardinal.  Z value is the 
         /// </summary>
@@ -81,6 +80,10 @@ namespace OpenSim.Region.Framework.Scenes
             TriggerRegionY = triggerRegionY;
         }
 
+        /// <summary>
+        /// Tests to see if the given position would cross this border.
+        /// </summary>
+        /// <returns></returns>
         public bool TestCross(Vector3 position)
         {
             bool result = false;