* Fixes SQLite load crash.

* added primary key to regionsettings table in the cached table
* initialized the data adapter.
* Still untested fully, so watch out!

1 files changed, 3 insertions, 2 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index c3ff47f..ccd712a 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Data.SQLite
             landAccessListDa = new SqliteDataAdapter(landAccessListSelectCmd);
 
             SqliteCommand regionSettingsSelectCmd = new SqliteCommand(regionSettingsSelect, m_conn);
-
+            regionSettingsDa = new SqliteDataAdapter(regionSettingsSelectCmd);
             // This actually does the roll forward assembly stuff
             Assembly assem = GetType().Assembly;
             Migration m = new Migration(m_conn, assem, "RegionStore");
@@ -148,6 +148,7 @@ namespace OpenSim.Data.SQLite
                 setupLandAccessCommands(landAccessListDa, m_conn);
 
                 ds.Tables.Add(createRegionSettingsTable());
+                
                 setupRegionSettingsCommands(regionSettingsDa, m_conn);
 
                 // WORKAROUND: This is a work around for sqlite on
@@ -963,7 +964,7 @@ namespace OpenSim.Data.SQLite
             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;
         }