OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge

avinationmerge
Melanie 2011-10-25 02:15:01 +01:00
parent 353f0c0e03 b9930a6305
commit f387e84e51
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -896,13 +896,14 @@ namespace OpenSim.Region.Framework.Scenes
} }
/// <summary> /// <summary>
/// Another region is up. /// Process the fact that a neighbouring region has come up.
/// /// </summary>
/// <remarks>
/// We only add it to the neighbor list if it's within 1 region from here. /// We only add it to the neighbor list if it's within 1 region from here.
/// Agents may have draw distance values that cross two regions though, so /// Agents may have draw distance values that cross two regions though, so
/// we add it to the notify list regardless of distance. We'll check /// we add it to the notify list regardless of distance. We'll check
/// the agent's draw distance before notifying them though. /// the agent's draw distance before notifying them though.
/// </summary> /// </remarks>
/// <param name="otherRegion">RegionInfo handle for the new region.</param> /// <param name="otherRegion">RegionInfo handle for the new region.</param>
/// <returns>True after all operations complete, throws exceptions otherwise.</returns> /// <returns>True after all operations complete, throws exceptions otherwise.</returns>
public override void OtherRegionUp(GridRegion otherRegion) public override void OtherRegionUp(GridRegion otherRegion)
@ -914,7 +915,6 @@ namespace OpenSim.Region.Framework.Scenes
if (RegionInfo.RegionHandle != otherRegion.RegionHandle) if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
{ {
// If these are cast to INT because long + negative values + abs returns invalid data // If these are cast to INT because long + negative values + abs returns invalid data
int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX); int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX);
int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY); int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY);