diff options
author | Diva Canto | 2010-07-31 16:40:58 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-31 16:40:58 -0700 |
commit | c4ecbd1fb1ce5450b66a7de41a0e34cc3474e04a (patch) | |
tree | 0bdf9adcb49a5de2779bc2dee7c62027d3830c89 /OpenSim/Data/MSSQL | |
parent | Implemented console command "show hyperlinks". (diff) | |
download | opensim-SC-c4ecbd1fb1ce5450b66a7de41a0e34cc3474e04a.zip opensim-SC-c4ecbd1fb1ce5450b66a7de41a0e34cc3474e04a.tar.gz opensim-SC-c4ecbd1fb1ce5450b66a7de41a0e34cc3474e04a.tar.bz2 opensim-SC-c4ecbd1fb1ce5450b66a7de41a0e34cc3474e04a.tar.xz |
White space from previous commit.
Diffstat (limited to 'OpenSim/Data/MSSQL')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index 73c67d4..9656be1 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs | |||
@@ -306,37 +306,37 @@ namespace OpenSim.Data.MSSQL | |||
306 | return true; | 306 | return true; |
307 | } | 307 | } |
308 | return false; | 308 | return false; |
309 | } | 309 | } |
310 | 310 | ||
311 | public List<RegionData> GetDefaultRegions(UUID scopeID) | 311 | public List<RegionData> GetDefaultRegions(UUID scopeID) |
312 | { | 312 | { |
313 | return Get((int)RegionFlags.DefaultRegion, scopeID); | 313 | return Get((int)RegionFlags.DefaultRegion, scopeID); |
314 | } | 314 | } |
315 | 315 | ||
316 | public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y) | 316 | public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y) |
317 | { | 317 | { |
318 | // TODO: distance-sort results | 318 | // TODO: distance-sort results |
319 | return Get((int)RegionFlags.FallbackRegion, scopeID); | 319 | return Get((int)RegionFlags.FallbackRegion, scopeID); |
320 | } | 320 | } |
321 | 321 | ||
322 | public List<RegionData> GetHyperlinks(UUID scopeID) | 322 | public List<RegionData> GetHyperlinks(UUID scopeID) |
323 | { | 323 | { |
324 | return Get((int)RegionFlags.Hyperlink, scopeID); | 324 | return Get((int)RegionFlags.Hyperlink, scopeID); |
325 | } | 325 | } |
326 | 326 | ||
327 | private List<RegionData> Get(int regionFlags, UUID scopeID) | 327 | private List<RegionData> Get(int regionFlags, UUID scopeID) |
328 | { | 328 | { |
329 | string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & " + regionFlags.ToString() + ") <> 0"; | 329 | string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & " + regionFlags.ToString() + ") <> 0"; |
330 | if (scopeID != UUID.Zero) | 330 | if (scopeID != UUID.Zero) |
331 | sql += " AND ScopeID = @scopeID"; | 331 | sql += " AND ScopeID = @scopeID"; |
332 | 332 | ||
333 | using (SqlConnection conn = new SqlConnection(m_ConnectionString)) | 333 | using (SqlConnection conn = new SqlConnection(m_ConnectionString)) |
334 | using (SqlCommand cmd = new SqlCommand(sql, conn)) | 334 | using (SqlCommand cmd = new SqlCommand(sql, conn)) |
335 | { | 335 | { |
336 | cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID)); | 336 | cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID)); |
337 | conn.Open(); | 337 | conn.Open(); |
338 | return RunCommand(cmd); | 338 | return RunCommand(cmd); |
339 | } | 339 | } |
340 | } | 340 | } |
341 | } | 341 | } |
342 | } | 342 | } |