aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorFernando Oliveira2013-11-25 21:20:56 -0200
committerMichael Cerquoni2013-11-25 18:33:49 -0500
commit0ad45531a18ad577b36818fbe5f51f23ff4a2a9b (patch)
treeea449fbbd50ca44684cb265ce281e95dd9f53a75
parentRevert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
downloadopensim-SC_OLD-0ad45531a18ad577b36818fbe5f51f23ff4a2a9b.zip
opensim-SC_OLD-0ad45531a18ad577b36818fbe5f51f23ff4a2a9b.tar.gz
opensim-SC_OLD-0ad45531a18ad577b36818fbe5f51f23ff4a2a9b.tar.bz2
opensim-SC_OLD-0ad45531a18ad577b36818fbe5f51f23ff4a2a9b.tar.xz
Corrected case to get columns from Regions table from PostgreSQL http://opensimulator.org/mantis/view.php?id=6865
Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
-rw-r--r--OpenSim/Data/PGSQL/PGSQLRegionData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
index 8a46559..f3e4064 100644
--- a/OpenSim/Data/PGSQL/PGSQLRegionData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Data.PGSQL
206 206
207 DataTable schemaTable = result.GetSchemaTable(); 207 DataTable schemaTable = result.GetSchemaTable();
208 foreach (DataRow row in schemaTable.Rows) 208 foreach (DataRow row in schemaTable.Rows)
209 m_ColumnNames.Add(row["ColumnName"].ToString()); 209 m_ColumnNames.Add(row["column_name"].ToString());
210 } 210 }
211 211
212 foreach (string s in m_ColumnNames) 212 foreach (string s in m_ColumnNames)
@@ -376,7 +376,7 @@ namespace OpenSim.Data.PGSQL
376 376
377 private List<RegionData> Get(int regionFlags, UUID scopeID) 377 private List<RegionData> Get(int regionFlags, UUID scopeID)
378 { 378 {
379 string sql = "SELECT * FROM " + m_Realm + " WHERE (flags & " + regionFlags.ToString() + ") <> 0"; 379 string sql = "SELECT * FROM " + m_Realm + " WHERE (\"flags\" & " + regionFlags.ToString() + ") <> 0";
380 if (scopeID != UUID.Zero) 380 if (scopeID != UUID.Zero)
381 sql += " AND \"ScopeID\" = :scopeID"; 381 sql += " AND \"ScopeID\" = :scopeID";
382 382