aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService/GridService.cs
diff options
context:
space:
mode:
authorMelanie2011-11-19 22:39:15 +0000
committerMelanie2011-11-19 22:39:15 +0000
commitbdb5ac96d9432eb568ed3e3bb46b012365f884bc (patch)
treefe2ce2636be7e750b3f235a6c04b9f3a5cf2f8af /OpenSim/Services/GridService/GridService.cs
parentMerge branch 'master' into bigmerge (diff)
parentRemove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre... (diff)
downloadopensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.zip
opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.gz
opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.bz2
opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Services/GridService/GridService.cs')
-rw-r--r--OpenSim/Services/GridService/GridService.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 05cfe5f..89f0716 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 {
@@ -236,18 +237,21 @@ namespace OpenSim.Services.GridService
236 } 237 }
237 238
238 m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}", 239 m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}",
239 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY); 240 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY);
240 241
241 return String.Empty; 242 return String.Empty;
242 } 243 }
243 244
244 public bool DeregisterRegion(UUID regionID) 245 public bool DeregisterRegion(UUID regionID)
245 { 246 {
246 m_log.DebugFormat("[GRID SERVICE]: Region {0} deregistered", regionID);
247 RegionData region = m_Database.Get(regionID, UUID.Zero); 247 RegionData region = m_Database.Get(regionID, UUID.Zero);
248 if (region == null) 248 if (region == null)
249 return false; 249 return false;
250 250
251 m_log.DebugFormat(
252 "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}",
253 region.RegionName, region.RegionID, region.coordX, region.coordY);
254
251 int flags = Convert.ToInt32(region.Data["flags"]); 255 int flags = Convert.ToInt32(region.Data["flags"]);
252 256
253 if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Data.RegionFlags.Persistent) != 0) 257 if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Data.RegionFlags.Persistent) != 0)
@@ -292,7 +296,7 @@ namespace OpenSim.Services.GridService
292 } 296 }
293 } 297 }
294 298
295 m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count); 299// m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
296 } 300 }
297 else 301 else
298 { 302 {