aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-04-25 18:36:29 +0100
committerMelanie2012-04-25 18:36:29 +0100
commit88c9fdfa3adda4984aed39bf800832adef883ecc (patch)
tree998a42e5ea1c472e80d9edbffb1fad8cb3d2b6f5 /OpenSim
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-88c9fdfa3adda4984aed39bf800832adef883ecc.zip
opensim-SC-88c9fdfa3adda4984aed39bf800832adef883ecc.tar.gz
opensim-SC-88c9fdfa3adda4984aed39bf800832adef883ecc.tar.bz2
opensim-SC-88c9fdfa3adda4984aed39bf800832adef883ecc.tar.xz
Adapt some TeleportWithMomentum calls
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 02ac091..06d5587 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1771,7 +1771,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1771 1771
1772 Vector3 pos = m_scene.GetNearestAllowedPosition(targetAvatar, land); 1772 Vector3 pos = m_scene.GetNearestAllowedPosition(targetAvatar, land);
1773 1773
1774 targetAvatar.TeleportWithMomentum(pos); 1774 targetAvatar.TeleportWithMomentum(pos, null);
1775 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname); 1775 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1776 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected."); 1776 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1777 1777
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8637df7..5a5f2e1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6115,7 +6115,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6115 if (m_host.OwnerID == land.LandData.OwnerID) 6115 if (m_host.OwnerID == land.LandData.OwnerID)
6116 { 6116 {
6117 Vector3 pos = World.GetNearestAllowedPosition(presence, land); 6117 Vector3 pos = World.GetNearestAllowedPosition(presence, land);
6118 presence.TeleportWithMomentum(pos); 6118 presence.TeleportWithMomentum(pos, null);
6119 presence.ControllingClient.SendAlertMessage("You have been ejected from this land"); 6119 presence.ControllingClient.SendAlertMessage("You have been ejected from this land");
6120 } 6120 }
6121 } 6121 }