OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve a merge issue

avinationmerge
Melanie 2010-02-08 22:44:17 +00:00
parent ad38450f9c
commit 0ad8046582
1 changed files with 87 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
View File

@ -715,12 +715,16 @@ namespace OpenSim.Data.MySQL
{ {
RegionMeta7WindlightData nWP = new RegionMeta7WindlightData(); RegionMeta7WindlightData nWP = new RegionMeta7WindlightData();
nWP.OnSave += StoreRegionWindlightSettings; nWP.OnSave += StoreRegionWindlightSettings;
lock (m_Connection)
using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
dbcon.Open();
string command = "select * from `regionwindlight` where region_id = ?regionID"; string command = "select * from `regionwindlight` where region_id = ?regionID";
MySqlCommand cmd = new MySqlCommand(command); using(MySqlCommand cmd = new MySqlCommand(command))
{
cmd.Connection = dbcon;
cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString()); cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString());
@ -799,6 +803,7 @@ namespace OpenSim.Data.MySQL
nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]); nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
} }
} }
}
return nWP; return nWP;
} }
@ -842,9 +847,11 @@ namespace OpenSim.Data.MySQL
public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl) public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
{ {
lock (m_Connection) using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
{ {
using (MySqlCommand cmd = m_Connection.CreateCommand()) dbcon.Open();
using (MySqlCommand cmd = dbcon.CreateCommand())
{ {
cmd.CommandText = "REPLACE INTO `regionwindlight` (`region_id`, `water_color_r`, `water_color_g`, "; cmd.CommandText = "REPLACE INTO `regionwindlight` (`region_id`, `water_color_r`, `water_color_g`, ";
cmd.CommandText += "`water_color_b`, `water_fog_density_exponent`, `underwater_fog_modifier`, "; cmd.CommandText += "`water_color_b`, `water_fog_density_exponent`, `underwater_fog_modifier`, ";