ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
This commit is contained in:
Melanie
2012-06-08 00:14:39 +01:00
parent 69dd5b855a af2954898e
commit c5af3e384c
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -1233,7 +1233,7 @@ namespace OpenSim.Region.CoreModules.World.Land
if (land.LandData.LocalID == LandData.LocalID)
{
Vector3 pos = m_scene.GetNearestAllowedPosition(presence, land);
presence.TeleportWithMomentum(pos);
presence.TeleportWithMomentum(pos, null);
presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
}
}