diff options
| author | Melanie | 2013-12-07 01:08:49 +0000 |
|---|---|---|
| committer | Melanie | 2013-12-07 01:08:49 +0000 |
| commit | 6d6b9ab791a6a759b2a3a8469569f536b3525894 (patch) | |
| tree | 9b3a1a63f8b6bd4596d11904be04e667747601c7 /OpenSim/Data/PGSQL/PGSQLRegionData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Adding profile partners fix to SQLite and PgSQL drivers (diff) | |
| download | opensim-SC-6d6b9ab791a6a759b2a3a8469569f536b3525894.zip opensim-SC-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.gz opensim-SC-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.bz2 opensim-SC-6d6b9ab791a6a759b2a3a8469569f536b3525894.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLRegionData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs index 8a46559..b3076f0 100644 --- a/OpenSim/Data/PGSQL/PGSQLRegionData.cs +++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs | |||
| @@ -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 | ||