diff options
author | fernando | 2013-10-15 11:55:08 -0500 |
---|---|---|
committer | fernando | 2013-10-15 11:55:08 -0500 |
commit | 3e1ca2bd2136a51f23dff0d31f4725b4e05c3f7c (patch) | |
tree | 9fb7fd2e5f57862cdd5bfeff1355d7be761e75e6 /OpenSim/Data/PGSQL/PGSQLSimulationData.cs | |
parent | Made terrain uploads thread-safe (diff) | |
download | opensim-SC_OLD-3e1ca2bd2136a51f23dff0d31f4725b4e05c3f7c.zip opensim-SC_OLD-3e1ca2bd2136a51f23dff0d31f4725b4e05c3f7c.tar.gz opensim-SC_OLD-3e1ca2bd2136a51f23dff0d31f4725b4e05c3f7c.tar.bz2 opensim-SC_OLD-3e1ca2bd2136a51f23dff0d31f4725b4e05c3f7c.tar.xz |
* Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)
* Please test
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLSimulationData.cs')
-rw-r--r-- | OpenSim/Data/PGSQL/PGSQLSimulationData.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs index 5753ae3..69b0beb 100644 --- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs +++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs | |||
@@ -727,7 +727,7 @@ namespace OpenSim.Data.PGSQL | |||
727 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) | 727 | using (NpgsqlConnection conn = new NpgsqlConnection(m_connectionString)) |
728 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) | 728 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
729 | { | 729 | { |
730 | cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID)); | 730 | cmd.Parameters.Add(_Database.CreateParameter("regionID", regionUUID.ToString() )); |
731 | conn.Open(); | 731 | conn.Open(); |
732 | using (NpgsqlDataReader result = cmd.ExecuteReader()) | 732 | using (NpgsqlDataReader result = cmd.ExecuteReader()) |
733 | { | 733 | { |
@@ -817,7 +817,7 @@ namespace OpenSim.Data.PGSQL | |||
817 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) | 817 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
818 | { | 818 | { |
819 | conn.Open(); | 819 | conn.Open(); |
820 | cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID)); | 820 | cmd.Parameters.Add(_Database.CreateParameter("region_id", regionID.ToString())); |
821 | cmd.ExecuteNonQuery(); | 821 | cmd.ExecuteNonQuery(); |
822 | } | 822 | } |
823 | } | 823 | } |
@@ -831,8 +831,8 @@ namespace OpenSim.Data.PGSQL | |||
831 | conn.Open(); | 831 | conn.Open(); |
832 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) | 832 | using (NpgsqlCommand cmd = new NpgsqlCommand(sql, conn)) |
833 | { | 833 | { |
834 | cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID)); | 834 | cmd.Parameters.Add(_Database.CreateParameter("region_id", wl.regionID.ToString() )); |
835 | exists = (int)cmd.ExecuteScalar() > 0; | 835 | exists = cmd.ExecuteNonQuery() > 0; |
836 | } | 836 | } |
837 | } | 837 | } |
838 | if (exists) | 838 | if (exists) |