diff options
| author | Melanie | 2012-06-08 00:14:39 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-08 00:14:39 +0100 |
| commit | c5af3e384c386dcc46588f97b342212945ada3f5 (patch) | |
| tree | 011a47c2644eb4076f49d68a46c3dd9c91c1875b /OpenSim/Region/CoreModules | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c5af3e384c386dcc46588f97b342212945ada3f5.zip opensim-SC_OLD-c5af3e384c386dcc46588f97b342212945ada3f5.tar.gz opensim-SC_OLD-c5af3e384c386dcc46588f97b342212945ada3f5.tar.bz2 opensim-SC_OLD-c5af3e384c386dcc46588f97b342212945ada3f5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index f32e4d8..b7667b9 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -1233,7 +1233,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 1233 | if (land.LandData.LocalID == LandData.LocalID) | 1233 | if (land.LandData.LocalID == LandData.LocalID) |
| 1234 | { | 1234 | { |
| 1235 | Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land); | 1235 | Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land); |
| 1236 | presence.TeleportWithMomentum(pos); | 1236 | presence.TeleportWithMomentum(pos, null); |
| 1237 | presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); | 1237 | presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); |
| 1238 | } | 1238 | } |
| 1239 | } | 1239 | } |