diff options
author | Melanie | 2011-01-28 01:37:37 +0100 |
---|---|---|
committer | Melanie | 2011-01-28 01:37:37 +0100 |
commit | 7492131bb60129f5ce875ee376fc10b477e3fc5f (patch) | |
tree | ac64f7844b1a1b7e06363badb1492ac5db73ec3a /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-7492131bb60129f5ce875ee376fc10b477e3fc5f.zip opensim-SC-7492131bb60129f5ce875ee376fc10b477e3fc5f.tar.gz opensim-SC-7492131bb60129f5ce875ee376fc10b477e3fc5f.tar.bz2 opensim-SC-7492131bb60129f5ce875ee376fc10b477e3fc5f.tar.xz |
Fix bumping into sim borders and check estate bans for walking crossings
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index bb9a748..5caf06c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4022,14 +4022,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
4022 | RequestTeleportLocation(remoteClient, info.RegionHandle, position, Vector3.Zero, (uint)(TPFlags.SetLastToTarget | TPFlags.ViaLandmark)); | 4022 | RequestTeleportLocation(remoteClient, info.RegionHandle, position, Vector3.Zero, (uint)(TPFlags.SetLastToTarget | TPFlags.ViaLandmark)); |
4023 | } | 4023 | } |
4024 | 4024 | ||
4025 | public void CrossAgentToNewRegion(ScenePresence agent, bool isFlying) | 4025 | public bool CrossAgentToNewRegion(ScenePresence agent, bool isFlying) |
4026 | { | 4026 | { |
4027 | if (m_teleportModule != null) | 4027 | if (m_teleportModule != null) |
4028 | m_teleportModule.Cross(agent, isFlying); | 4028 | return m_teleportModule.Cross(agent, isFlying); |
4029 | else | 4029 | else |
4030 | { | 4030 | { |
4031 | m_log.DebugFormat("[SCENE]: Unable to cross agent to neighbouring region, because there is no AgentTransferModule"); | 4031 | m_log.DebugFormat("[SCENE]: Unable to cross agent to neighbouring region, because there is no AgentTransferModule"); |
4032 | } | 4032 | } |
4033 | |||
4034 | return false; | ||
4033 | } | 4035 | } |
4034 | 4036 | ||
4035 | public void SendOutChildAgentUpdates(AgentPosition cadu, ScenePresence presence) | 4037 | public void SendOutChildAgentUpdates(AgentPosition cadu, ScenePresence presence) |