diff options
author | Charles Krinke | 2008-06-30 14:09:19 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-30 14:09:19 +0000 |
commit | 4cb42d4c3596845ab8afd076c5e742de4685df91 (patch) | |
tree | b59e6647b850f04b70ed38ac0d4c17f87acfc3ba /OpenSim/Data/MySQL | |
parent | Update svn properties. (diff) | |
download | opensim-SC-4cb42d4c3596845ab8afd076c5e742de4685df91.zip opensim-SC-4cb42d4c3596845ab8afd076c5e742de4685df91.tar.gz opensim-SC-4cb42d4c3596845ab8afd076c5e742de4685df91.tar.bz2 opensim-SC-4cb42d4c3596845ab8afd076c5e742de4685df91.tar.xz |
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.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLDataStore.cs | 6 |
1 files changed, 6 insertions, 0 deletions
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 | |||
761 | { | 761 | { |
762 | fillRegionSettingsRow(settingsRow, rs); | 762 | fillRegionSettingsRow(settingsRow, rs); |
763 | } | 763 | } |
764 | |||
765 | Commit(); | ||
764 | } | 766 | } |
765 | } | 767 | } |
766 | 768 | ||
@@ -910,6 +912,7 @@ namespace OpenSim.Data.MySQL | |||
910 | m_landDataAdapter.Update(m_landTable); | 912 | m_landDataAdapter.Update(m_landTable); |
911 | m_landAccessListDataAdapter.Update(m_landAccessListTable); | 913 | m_landAccessListDataAdapter.Update(m_landAccessListTable); |
912 | m_regionBanListDataAdapter.Update(m_regionBanListTable); | 914 | m_regionBanListDataAdapter.Update(m_regionBanListTable); |
915 | m_regionSettingsDataAdapter.Update(m_regionSettingsTable); | ||
913 | 916 | ||
914 | m_dataSet.AcceptChanges(); | 917 | m_dataSet.AcceptChanges(); |
915 | } | 918 | } |
@@ -999,6 +1002,9 @@ namespace OpenSim.Data.MySQL | |||
999 | createCol(regionsettings, "fixed_sun", typeof (Int32)); | 1002 | createCol(regionsettings, "fixed_sun", typeof (Int32)); |
1000 | createCol(regionsettings, "sun_position", typeof (Double)); | 1003 | createCol(regionsettings, "sun_position", typeof (Double)); |
1001 | createCol(regionsettings, "covenant", typeof(String)); | 1004 | createCol(regionsettings, "covenant", typeof(String)); |
1005 | |||
1006 | regionsettings.PrimaryKey = new DataColumn[] {regionsettings.Columns["RegionUUID"]}; | ||
1007 | |||
1002 | return regionsettings; | 1008 | return regionsettings; |
1003 | } | 1009 | } |
1004 | 1010 | ||