From 2c5a3ff9f0c292dfc30650d6a553da38ec751db3 Mon Sep 17 00:00:00 2001 From: dahlia Date: Wed, 24 Jun 2015 03:46:30 -0700 Subject: [PATCH] Thanks Gavin Hird for a fix for an exception when requesting an Estate Ban when using PGSQL. --- OpenSim/Data/PGSQL/PGSQLEstateData.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs index 5ad0eaabf1..b5ca235200 100644 --- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs +++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs @@ -107,8 +107,8 @@ namespace OpenSim.Data.PGSQL { EstateSettings es = new EstateSettings(); - string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) + - "\" from estate_map left join estate_settings on estate_map.\"EstateID\" = estate_settings.\"EstateID\" " + + string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) + + "\" from estate_map left join estate_settings on estate_map.\"EstateID\" = estate_settings.\"EstateID\" " + " where estate_settings.\"EstateID\" is not null and \"RegionID\" = :RegionID"; bool insertEstate = false; @@ -500,7 +500,7 @@ namespace OpenSim.Data.PGSQL public List GetEstatesByOwner(UUID ownerID) { List result = new List(); - string sql = "select \"estateID\" from estate_settings where \"EstateOwner\" = :EstateOwner"; + string sql = "select \"EstateID\" from estate_settings where \"EstateOwner\" = :EstateOwner"; using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) { conn.Open();