diff options
author | UbitUmarov | 2014-10-21 11:57:47 +0100 |
---|---|---|
committer | UbitUmarov | 2014-10-21 11:57:47 +0100 |
commit | 59413adceecd7f6c9132f03b436b7a0b5cabb443 (patch) | |
tree | 5ff0b203e40f2a693ac9e6130a89cff550cd82a9 /OpenSim/Region/Framework/Scenes | |
parent | Assume childreen don't need to know caps seeds (diff) | |
download | opensim-SC-59413adceecd7f6c9132f03b436b7a0b5cabb443.zip opensim-SC-59413adceecd7f6c9132f03b436b7a0b5cabb443.tar.gz opensim-SC-59413adceecd7f6c9132f03b436b7a0b5cabb443.tar.bz2 opensim-SC-59413adceecd7f6c9132f03b436b7a0b5cabb443.tar.xz |
do agent crossing async, including QUERYACCESS ( need to check vehicles for
this also ), so it doesn't stop heartbeat
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 754dd96..b746e3a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3980,6 +3980,30 @@ namespace OpenSim.Region.Framework.Scenes | |||
3980 | 3980 | ||
3981 | } | 3981 | } |
3982 | 3982 | ||
3983 | public void CrossToNewRegionFail() | ||
3984 | { | ||
3985 | if (m_requestedSitTargetUUID == UUID.Zero) | ||
3986 | { | ||
3987 | bool isFlying = Flying; | ||
3988 | RemoveFromPhysicalScene(); | ||
3989 | |||
3990 | Vector3 pos = AbsolutePosition; | ||
3991 | if (AbsolutePosition.X < 0) | ||
3992 | pos.X += Velocity.X * 2; | ||
3993 | else if (AbsolutePosition.X > Constants.RegionSize) | ||
3994 | pos.X -= Velocity.X * 2; | ||
3995 | if (AbsolutePosition.Y < 0) | ||
3996 | pos.Y += Velocity.Y * 2; | ||
3997 | else if (AbsolutePosition.Y > Constants.RegionSize) | ||
3998 | pos.Y -= Velocity.Y * 2; | ||
3999 | Velocity = Vector3.Zero; | ||
4000 | AbsolutePosition = pos; | ||
4001 | |||
4002 | AddToPhysicalScene(isFlying); | ||
4003 | } | ||
4004 | |||
4005 | } | ||
4006 | |||
3983 | /// <summary> | 4007 | /// <summary> |
3984 | /// Moves the agent outside the region bounds | 4008 | /// Moves the agent outside the region bounds |
3985 | /// Tells neighbor region that we're crossing to it | 4009 | /// Tells neighbor region that we're crossing to it |
@@ -3996,7 +4020,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3996 | } | 4020 | } |
3997 | catch | 4021 | catch |
3998 | { | 4022 | { |
3999 | result = m_scene.CrossAgentToNewRegion(this, false); | 4023 | // result = m_scene.CrossAgentToNewRegion(this, false); |
4000 | } | 4024 | } |
4001 | // if(!result) | 4025 | // if(!result) |
4002 | // parcelRegionCross(true); | 4026 | // parcelRegionCross(true); |