From 3e1ca2bd2136a51f23dff0d31f4725b4e05c3f7c Mon Sep 17 00:00:00 2001 From: fernando Date: Tue, 15 Oct 2013 11:55:08 -0500 Subject: * Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled) * Please test --- OpenSim/Data/PGSQL/PGSQLEstateData.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'OpenSim/Data/PGSQL/PGSQLEstateData.cs') diff --git a/OpenSim/Data/PGSQL/PGSQLEstateData.cs b/OpenSim/Data/PGSQL/PGSQLEstateData.cs index 347baf3..141b8ed 100644 --- a/OpenSim/Data/PGSQL/PGSQLEstateData.cs +++ b/OpenSim/Data/PGSQL/PGSQLEstateData.cs @@ -201,11 +201,10 @@ namespace OpenSim.Data.PGSQL string sql = string.Format("insert into estate_settings (\"{0}\") values ( :{1} )", String.Join("\",\"", names.ToArray()), String.Join(", :", names.ToArray())); - m_log.Debug("[DB ESTATE]: SQL: " + sql); using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) using (NpgsqlCommand insertCommand = new NpgsqlCommand(sql, conn)) { - insertCommand.CommandText = sql + "; Select cast(lastval() as int) as ID ;"; + insertCommand.CommandText = sql; foreach (string name in names) { @@ -218,11 +217,16 @@ namespace OpenSim.Data.PGSQL es.EstateID = 100; - using (NpgsqlDataReader result = insertCommand.ExecuteReader()) + if (insertCommand.ExecuteNonQuery() > 0) { - if (result.Read()) + insertCommand.CommandText = "Select cast(lastval() as int) as ID ;"; + + using (NpgsqlDataReader result = insertCommand.ExecuteReader()) { - es.EstateID = (uint)result.GetInt32(0); + if (result.Read()) + { + es.EstateID = (uint)result.GetInt32(0); + } } } -- cgit v1.1