From 4cb42d4c3596845ab8afd076c5e742de4685df91 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Mon, 30 Jun 2008 14:09:19 +0000
Subject: Mantis#1637. Thank you kindly, Melanie for a patch that: Make each
 region load it's settings from the database on startup. No user functionality
 yet.

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

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 97aaf6a..f1a252d 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -761,6 +761,8 @@ namespace OpenSim.Data.MySQL
                 {
                     fillRegionSettingsRow(settingsRow, rs);
                 }
+
+                Commit();
             }
         }
 
@@ -910,6 +912,7 @@ namespace OpenSim.Data.MySQL
                 m_landDataAdapter.Update(m_landTable);
                 m_landAccessListDataAdapter.Update(m_landAccessListTable);
                 m_regionBanListDataAdapter.Update(m_regionBanListTable);
+                m_regionSettingsDataAdapter.Update(m_regionSettingsTable);
 
                 m_dataSet.AcceptChanges();
             }
@@ -999,6 +1002,9 @@ namespace OpenSim.Data.MySQL
             createCol(regionsettings, "fixed_sun", typeof (Int32));
             createCol(regionsettings, "sun_position", typeof (Double));
             createCol(regionsettings, "covenant", typeof(String));
+
+            regionsettings.PrimaryKey = new DataColumn[] {regionsettings.Columns["RegionUUID"]};
+
             return regionsettings;
         }
 
-- 
cgit v1.1