ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)

Browse Source 
* Please test
This commit is contained in:
fernando
2013-10-15 11:55:08 -05:00
parent f106ba87ca
commit 3e1ca2bd21
4 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Data/PGSQL/PGSQLEstateData.cs
View File

@@ -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);
}
}
}