diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-06 16:15:06 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-06 16:15:06 -0400 |
| commit | 511bddc8bc5783919a8135b69ddd6c974fbcf1f7 (patch) | |
| tree | 8ccc29f9c45559c896b848442e91f4ccaa849e7b /OpenSim | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-511bddc8bc5783919a8135b69ddd6c974fbcf1f7.zip opensim-SC_OLD-511bddc8bc5783919a8135b69ddd6c974fbcf1f7.tar.gz opensim-SC_OLD-511bddc8bc5783919a8135b69ddd6c974fbcf1f7.tar.bz2 opensim-SC_OLD-511bddc8bc5783919a8135b69ddd6c974fbcf1f7.tar.xz | |
* Moves another Legacy avatar inbounds check to Border
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c25ae10..278091f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -3140,11 +3140,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3140 | 3140 | ||
| 3141 | if (!agent.child) | 3141 | if (!agent.child) |
| 3142 | { | 3142 | { |
| 3143 | if (agent.startpos.X > (int)Constants.RegionSize - 1) | 3143 | if (TestBorderCross(agent.startpos,Cardinals.E)) |
| 3144 | agent.startpos.X = (int)Constants.RegionSize - 1; | 3144 | { |
| 3145 | Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.E); | ||
| 3146 | agent.startpos.X = crossedBorder.BorderLine.Z - 1; | ||
| 3147 | } | ||
| 3145 | 3148 | ||
| 3146 | if (agent.startpos.Y > (int)Constants.RegionSize - 1) | 3149 | if (TestBorderCross(agent.startpos, Cardinals.N)) |
| 3147 | agent.startpos.Y = (int)Constants.RegionSize - 1; | 3150 | { |
| 3151 | Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.N); | ||
| 3152 | agent.startpos.Y = crossedBorder.BorderLine.Z - 1; | ||
| 3153 | } | ||
| 3148 | 3154 | ||
| 3149 | // Honor parcel landing type and position. | 3155 | // Honor parcel landing type and position. |
| 3150 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); | 3156 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); |