aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-19 00:07:34 +0000
committerJustin Clark-Casey (justincc)2011-11-19 00:07:34 +0000
commit01ae916bad672722aa62ee712b7b580d6f5f4370 (patch)
tree82199ee4f473d9639e73a67cc8b2f30aeaeb047b /OpenSim/Services/GridService
parentReplace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied. (diff)
downloadopensim-SC_OLD-01ae916bad672722aa62ee712b7b580d6f5f4370.zip
opensim-SC_OLD-01ae916bad672722aa62ee712b7b580d6f5f4370.tar.gz
opensim-SC_OLD-01ae916bad672722aa62ee712b7b580d6f5f4370.tar.bz2
opensim-SC_OLD-01ae916bad672722aa62ee712b7b580d6f5f4370.tar.xz
Don't register a region twice on both official registration and maptile regeneration.
Maptile storage appears orthogonal to region registration
Diffstat (limited to 'OpenSim/Services/GridService')
-rw-r--r--OpenSim/Services/GridService/GridService.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 05cfe5f..768e4e1 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Services.GridService
156 regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); 156 regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
157 return "Region overlaps another region"; 157 return "Region overlaps another region";
158 } 158 }
159
159 if ((region != null) && (region.RegionID == regionInfos.RegionID) && 160 if ((region != null) && (region.RegionID == regionInfos.RegionID) &&
160 ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY))) 161 ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
161 { 162 {