aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2010-01-10 02:07:10 +0000
committerMelanie2010-01-10 02:07:10 +0000
commit21de921b95da3d6fe94284365d836d71f3295a41 (patch)
tree80fceac4e7fd164741b5630b4d33d009f7f6cc75 /OpenSim/Services
parentMerge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensi... (diff)
downloadopensim-SC_OLD-21de921b95da3d6fe94284365d836d71f3295a41.zip
opensim-SC_OLD-21de921b95da3d6fe94284365d836d71f3295a41.tar.gz
opensim-SC_OLD-21de921b95da3d6fe94284365d836d71f3295a41.tar.bz2
opensim-SC_OLD-21de921b95da3d6fe94284365d836d71f3295a41.tar.xz
Make the new API return only the regions that are marked online
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/GridService/GridService.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 0fd2934..3ae51e4 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -299,7 +299,10 @@ namespace OpenSim.Services.GridService
299 List<RegionData> regions = m_Database.GetDefaultRegions(scopeID); 299 List<RegionData> regions = m_Database.GetDefaultRegions(scopeID);
300 300
301 foreach (RegionData r in regions) 301 foreach (RegionData r in regions)
302 ret.Add(RegionData2RegionInfo(r)); 302 {
303 if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Data.RegionFlags.RegionOnline) != 0)
304 ret.Add(RegionData2RegionInfo(r));
305 }
303 306
304 return ret; 307 return ret;
305 } 308 }
@@ -311,7 +314,10 @@ namespace OpenSim.Services.GridService
311 List<RegionData> regions = m_Database.GetFallbackRegions(scopeID, x, y); 314 List<RegionData> regions = m_Database.GetFallbackRegions(scopeID, x, y);
312 315
313 foreach (RegionData r in regions) 316 foreach (RegionData r in regions)
314 ret.Add(RegionData2RegionInfo(r)); 317 {
318 if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Data.RegionFlags.RegionOnline) != 0)
319 ret.Add(RegionData2RegionInfo(r));
320 }
315 321
316 return ret; 322 return ret;
317 } 323 }