aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordahlia2015-06-24 03:46:30 -0700
committerdahlia2015-06-24 03:46:30 -0700
commit2c5a3ff9f0c292dfc30650d6a553da38ec751db3 (patch)
treef947ad3929fc6f495bd479c0eaaf2d250fa9b514
parentFetchInventoryDescendents2: Signal to the viewer that folder with UUID.Zero i... (diff)
downloadopensim-SC_OLD-2c5a3ff9f0c292dfc30650d6a553da38ec751db3.zip
opensim-SC_OLD-2c5a3ff9f0c292dfc30650d6a553da38ec751db3.tar.gz
opensim-SC_OLD-2c5a3ff9f0c292dfc30650d6a553da38ec751db3.tar.bz2
opensim-SC_OLD-2c5a3ff9f0c292dfc30650d6a553da38ec751db3.tar.xz
Thanks Gavin Hird for a fix for an exception when requesting an Estate Ban when using PGSQL.
-rw-r--r--OpenSim/Data/PGSQL/PGSQLEstateData.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
index 5ad0eaa..b5ca235 100644
--- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -107,8 +107,8 @@ namespace OpenSim.Data.PGSQL
107 { 107 {
108 EstateSettings es = new EstateSettings(); 108 EstateSettings es = new EstateSettings();
109 109
110 string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) + 110 string sql = "select estate_settings.\"" + String.Join("\",estate_settings.\"", FieldList) +
111 "\" from estate_map left join estate_settings on estate_map.\"EstateID\" = estate_settings.\"EstateID\" " + 111 "\" from estate_map left join estate_settings on estate_map.\"EstateID\" = estate_settings.\"EstateID\" " +
112 " where estate_settings.\"EstateID\" is not null and \"RegionID\" = :RegionID"; 112 " where estate_settings.\"EstateID\" is not null and \"RegionID\" = :RegionID";
113 113
114 bool insertEstate = false; 114 bool insertEstate = false;
@@ -500,7 +500,7 @@ namespace OpenSim.Data.PGSQL
500 public List<int> GetEstatesByOwner(UUID ownerID) 500 public List<int> GetEstatesByOwner(UUID ownerID)
501 { 501 {
502 List<int> result = new List<int>(); 502 List<int> result = new List<int>();
503 string sql = "select \"estateID\" from estate_settings where \"EstateOwner\" = :EstateOwner"; 503 string sql = "select \"EstateID\" from estate_settings where \"EstateOwner\" = :EstateOwner";
504 using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) 504 using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
505 { 505 {
506 conn.Open(); 506 conn.Open();