diff options
| author | opensim mirror account | 2010-11-09 15:10:08 -0800 |
|---|---|---|
| committer | opensim mirror account | 2010-11-09 15:10:08 -0800 |
| commit | a969036562b6d11dad3572af18043a3527e0aadd (patch) | |
| tree | 6e56074b4658fb43e7f6283abf531e89ec69bbb7 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Fix parcel bans to work only on the avatars they're supposed to work on inste... (diff) | |
| download | opensim-SC_OLD-a969036562b6d11dad3572af18043a3527e0aadd.zip opensim-SC_OLD-a969036562b6d11dad3572af18043a3527e0aadd.tar.gz opensim-SC_OLD-a969036562b6d11dad3572af18043a3527e0aadd.tar.bz2 opensim-SC_OLD-a969036562b6d11dad3572af18043a3527e0aadd.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 94a773d..c5396d5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4740,7 +4740,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4740 | Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar); | 4740 | Vector3 nearestRegionEdgePoint = GetNearestRegionEdgePosition(avatar); |
| 4741 | //Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString()); | 4741 | //Debug.WriteLine("They are really in a place they don't belong, sending them to: " + nearestRegionEdgePoint.ToString()); |
| 4742 | return nearestRegionEdgePoint; | 4742 | return nearestRegionEdgePoint; |
| 4743 | return null; | ||
| 4744 | } | 4743 | } |
| 4745 | 4744 | ||
| 4746 | private Vector3 GetParcelCenterAtGround(ILandObject parcel) | 4745 | private Vector3 GetParcelCenterAtGround(ILandObject parcel) |