aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-03-05 02:14:27 +0100
committerMelanie2012-03-05 02:14:27 +0100
commit0ed4f24b3432d282f2f1517d403341cde069af29 (patch)
tree07d193e2df7b16739ddb1412b908857ef3334b44 /OpenSim
parentZero velocity when drag-copying (diff)
downloadopensim-SC_OLD-0ed4f24b3432d282f2f1517d403341cde069af29.zip
opensim-SC_OLD-0ed4f24b3432d282f2f1517d403341cde069af29.tar.gz
opensim-SC_OLD-0ed4f24b3432d282f2f1517d403341cde069af29.tar.bz2
opensim-SC_OLD-0ed4f24b3432d282f2f1517d403341cde069af29.tar.xz
A stab at making llEjectFromLand work in all cases
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 11a41aa..5d27d86 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4938,9 +4938,16 @@ Environment.Exit(1);
4938 return nearestPoint.Value; 4938 return nearestPoint.Value;
4939 } 4939 }
4940 4940
4941 //Ultimate backup if we have no idea where they are 4941 ILandObject dest = LandChannel.GetLandObject(avatar.lastKnownAllowedPosition.X, avatar.lastKnownAllowedPosition.Y);
4942 Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString()); 4942 if (dest != excludeParcel)
4943 return avatar.lastKnownAllowedPosition; 4943 {
4944 // Ultimate backup if we have no idea where they are and
4945 // the last allowed position was in another parcel
4946 Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
4947 return avatar.lastKnownAllowedPosition;
4948 }
4949
4950 // else fall through to region edge
4944 } 4951 }
4945 4952
4946 //Go to the edge, this happens in teleporting to a region with no available parcels 4953 //Go to the edge, this happens in teleporting to a region with no available parcels