From bf34f65125b7af6fc44b9eea85cf3c6c7333f1c9 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Tue, 1 Jul 2008 02:16:58 +0000
Subject: Mantis#1639. Thank you, Melanie for a patch that: Reads
 estate_settings.xml and populates the database from it. If there is no
 record, just passes the defaults to the application.

---
 OpenSim/Data/MySQL/MySQLDataStore.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index f1a252d..69f9a16 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -736,7 +736,14 @@ namespace OpenSim.Data.MySQL
                 string searchExp = "regionUUID = '" + regionUUID.ToString() + "'";
                 DataRow[] rawsettings = regionsettings.Select(searchExp);
                 if(rawsettings.Length == 0)
-                    return null;
+                {
+                    RegionSettings rs = new RegionSettings();
+                    rs.RegionUUID = regionUUID;
+
+                    StoreRegionSettings(rs);
+
+                    return rs;
+                }
                 DataRow row = rawsettings[0];
 
                 return buildRegionSettings(row);
-- 
cgit v1.1