Merge branch 'master' into htb-throttle

This commit is contained in:
Melanie
2009-10-14 23:31:38 +01:00
5 changed files with 15 additions and 37 deletions

View File

@@ -1796,6 +1796,7 @@ namespace OpenSim.Region.Framework.Scenes
if (crossedBordery.BorderLine.Z > 0)
{
pos.Y = ((pos.Y + crossedBordery.BorderLine.Z));
changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize);
}
else
pos.Y = ((pos.Y + Constants.RegionSize));