ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 14:16:07 +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

8
OpenSim/Data/PGSQL/PGSQLSimulationData.cs
View File

@@ -727,7 +727,7 @@ namespace OpenSim.Data.PGSQL
using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString))
using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
{
cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID));
cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID.ToString() ));
conn.Open();
using (NpgsqlDataReader result = cmd.ExecuteReader())
{
@@ -817,7 +817,7 @@ namespace OpenSim.Data.PGSQL
using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
{
conn.Open();
cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID));
cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID.ToString()));
cmd.ExecuteNonQuery();
}
}
@@ -831,8 +831,8 @@ namespace OpenSim.Data.PGSQL
conn.Open();
using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn))
{
cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID));
exists = (int)cmd.ExecuteScalar() > 0;
cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString() ));
exists = cmd.ExecuteNonQuery() > 0;
}
}
if (exists)