diff options
| author | Melanie | 2011-01-27 06:45:53 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-27 06:45:53 +0100 |
| commit | 1143e022b41c835bf0d587c2ddd6a70504d78d42 (patch) | |
| tree | 5f2513536d940723161cc10e8e8efed3486dda7a /OpenSim/Region/CoreModules | |
| parent | Change the way landing points are honored (diff) | |
| download | opensim-SC_OLD-1143e022b41c835bf0d587c2ddd6a70504d78d42.zip opensim-SC_OLD-1143e022b41c835bf0d587c2ddd6a70504d78d42.tar.gz opensim-SC_OLD-1143e022b41c835bf0d587c2ddd6a70504d78d42.tar.bz2 opensim-SC_OLD-1143e022b41c835bf0d587c2ddd6a70504d78d42.tar.xz | |
Make landing points work on local teleports. Constrain owners and gods to
landing points when coming from off sim (matches agni) to prevent landing
in floors or other prims.
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 4bf2477..677961d 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -177,6 +177,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 177 | sp.ControllingClient.SendTeleportStart(teleportFlags); | 177 | sp.ControllingClient.SendTeleportStart(teleportFlags); |
| 178 | 178 | ||
| 179 | sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); | 179 | sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags); |
| 180 | sp.TeleportFlags = (TeleportFlags)teleportFlags; | ||
| 180 | sp.Teleport(position); | 181 | sp.Teleport(position); |
| 181 | 182 | ||
| 182 | foreach (SceneObjectGroup grp in sp.Attachments) | 183 | foreach (SceneObjectGroup grp in sp.Attachments) |