aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:15:01 +0100
committerMelanie2011-10-25 02:15:01 +0100
commitf387e84e519026543c150adfe315733f10bc6c50 (patch)
tree46f08657771393be67a624ef93ba0545096ce0c0 /OpenSim/Region
parentMerge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge (diff)
parentimprove method doc on Scene.OtherRegionUp() (diff)
downloadopensim-SC-f387e84e519026543c150adfe315733f10bc6c50.zip
opensim-SC-f387e84e519026543c150adfe315733f10bc6c50.tar.gz
opensim-SC-f387e84e519026543c150adfe315733f10bc6c50.tar.bz2
opensim-SC-f387e84e519026543c150adfe315733f10bc6c50.tar.xz
Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4776654..53c9366 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -896,13 +896,14 @@ namespace OpenSim.Region.Framework.Scenes
896 } 896 }
897 897
898 /// <summary> 898 /// <summary>
899 /// Another region is up. 899 /// Process the fact that a neighbouring region has come up.
900 /// 900 /// </summary>
901 /// <remarks>
901 /// We only add it to the neighbor list if it's within 1 region from here. 902 /// We only add it to the neighbor list if it's within 1 region from here.
902 /// Agents may have draw distance values that cross two regions though, so 903 /// Agents may have draw distance values that cross two regions though, so
903 /// we add it to the notify list regardless of distance. We'll check 904 /// we add it to the notify list regardless of distance. We'll check
904 /// the agent's draw distance before notifying them though. 905 /// the agent's draw distance before notifying them though.
905 /// </summary> 906 /// </remarks>
906 /// <param name="otherRegion">RegionInfo handle for the new region.</param> 907 /// <param name="otherRegion">RegionInfo handle for the new region.</param>
907 /// <returns>True after all operations complete, throws exceptions otherwise.</returns> 908 /// <returns>True after all operations complete, throws exceptions otherwise.</returns>
908 public override void OtherRegionUp(GridRegion otherRegion) 909 public override void OtherRegionUp(GridRegion otherRegion)
@@ -914,7 +915,6 @@ namespace OpenSim.Region.Framework.Scenes
914 915
915 if (RegionInfo.RegionHandle != otherRegion.RegionHandle) 916 if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
916 { 917 {
917
918 // If these are cast to INT because long + negative values + abs returns invalid data 918 // If these are cast to INT because long + negative values + abs returns invalid data
919 int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX); 919 int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX);
920 int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY); 920 int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY);