aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/PGSQL/PGSQLEstateData.cs
diff options
context:
space:
mode:
authorRobert Adams2013-10-28 09:30:26 -0700
committerRobert Adams2013-10-28 09:30:26 -0700
commit2be0347f5044ec723748c53db9290f3cf8bc431a (patch)
treeb52812ac7fcdcd8a7a985094e14ca3d461a39673 /OpenSim/Data/PGSQL/PGSQLEstateData.cs
parentvarregion: update PGSQL driver for storing variable terrain size blobs. (diff)
parentBulletSim: restore collision flags when clear collision cache. (diff)
downloadopensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.zip
opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.gz
opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.bz2
opensim-SC_OLD-2be0347f5044ec723748c53db9290f3cf8bc431a.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLEstateData.cs')
-rw-r--r--OpenSim/Data/PGSQL/PGSQLEstateData.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
index 141b8ed..5ad0eaa 100644
--- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs
@@ -452,7 +452,7 @@ namespace OpenSim.Data.PGSQL
452 public List<int> GetEstates(string search) 452 public List<int> GetEstates(string search)
453 { 453 {
454 List<int> result = new List<int>(); 454 List<int> result = new List<int>();
455 string sql = "select \"estateID\" from estate_settings where lower(\"EstateName\") = lower(:EstateName)"; 455 string sql = "select \"EstateID\" from estate_settings where lower(\"EstateName\") = lower(:EstateName)";
456 using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) 456 using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
457 { 457 {
458 conn.Open(); 458 conn.Open();