diff options
| author | Robert Adams | 2013-12-01 15:51:42 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-01 15:51:42 -0800 |
| commit | 31bacfbb63a3871af1ff1fbaec2acd5f5021c926 (patch) | |
| tree | fe9b9d826c1fdef55840d346ff5c9c481a4bfc82 /OpenSim/Data | |
| parent | varregion: Add MaxRegionSize constant and enforce in RegionInfo. (diff) | |
| parent | Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced fo... (diff) | |
| download | opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.zip opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.gz opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.bz2 opensim-SC_OLD-31bacfbb63a3871af1ff1fbaec2acd5f5021c926.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLRegionData.cs | 4 |
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 | ||