From 70b0e07d1ea99f8bd88f2be12bf9b53a39187f60 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 22 Mar 2010 18:49:56 +0000
Subject: Remove the reading of estate_settings.xml and the associated
 processing of defaults. Adding code to facilitate estate creation /
 managemment as part of first time start up

---
 OpenSim/Data/MySQL/MySQLEstateData.cs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index 2eae2d8..e94dcda 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public EstateSettings LoadEstateSettings(UUID regionID)
+        public EstateSettings LoadEstateSettings(UUID regionID, bool create)
         {
             EstateSettings es = new EstateSettings();
             es.OnSave += StoreEstateSettings;
@@ -129,12 +129,12 @@ namespace OpenSim.Data.MySQL
             string sql = "select estate_settings." + String.Join(",estate_settings.", FieldList) +
                 " from estate_map left join estate_settings on estate_map.EstateID = estate_settings.EstateID where estate_settings.EstateID is not null and RegionID = ?RegionID";
 
-            bool migration = true;
-
             using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
             {
                 dbcon.Open();
 
+                bool found = false;
+
                 using (MySqlCommand cmd = dbcon.CreateCommand())
                 {
                     cmd.CommandText = sql;
@@ -144,7 +144,7 @@ namespace OpenSim.Data.MySQL
                     {
                         if (r.Read())
                         {
-                            migration = false;
+                            found = true;
 
                             foreach (string name in FieldList)
                             {
@@ -172,7 +172,7 @@ namespace OpenSim.Data.MySQL
                     }
                 }
 
-                if (migration)
+                if (!found && create)
                 {
                     // Migration case
                     List<string> names = new List<string>(FieldList);
@@ -220,14 +220,6 @@ namespace OpenSim.Data.MySQL
                         try { cmd.ExecuteNonQuery(); }
                         catch (Exception) { }
 
-                        // Munge and transfer the ban list
-                        cmd.Parameters.Clear();
-                        cmd.CommandText = "insert into estateban select " + es.EstateID.ToString() + ", bannedUUID, bannedIp, bannedIpHostMask, '' from regionban where regionban.regionUUID = ?UUID";
-                        cmd.Parameters.AddWithValue("?UUID", regionID.ToString());
-
-                        try { cmd.ExecuteNonQuery(); }
-                        catch (Exception) { }
-
                         es.Save();
                     }
                 }
-- 
cgit v1.1