Merge git://github.com/opensim/opensim into mantis5110

1 files changed, 16 insertions, 0 deletions

diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index e2b6953..ae78814 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -817,6 +817,7 @@ namespace OpenSim.Data.MySQL
                         nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
                         nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
                         nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
+                        nWP.valid = true;
                     }
                 }
             }
@@ -964,6 +965,21 @@ namespace OpenSim.Data.MySQL
             }
         }
 
+        public void RemoveRegionWindlightSettings(UUID regionID)
+        {
+            using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
+            {
+                dbcon.Open();
+
+                using (MySqlCommand cmd = dbcon.CreateCommand())
+                {
+                    cmd.CommandText = "delete from `regionwindlight` where `region_id`=?regionID";
+                    cmd.Parameters.AddWithValue("?regionID", regionID.ToString());
+                    ExecuteNonQuery(cmd);
+                }
+            }
+        }
+
         public void StoreRegionSettings(RegionSettings rs)
         {
             lock (m_dbLock)