aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 21556da..63252aa 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -109,10 +109,17 @@ namespace OpenSim.Data.SQLite
109 { 109 {
110 EstateSettings es = new EstateSettings(); 110 EstateSettings es = new EstateSettings();
111 es.OnSave += StoreEstateSettings; 111 es.OnSave += StoreEstateSettings;
112 IDataReader r = null;
113 try
114 {
115 r = cmd.ExecuteReader();
116 }
117 catch (SqliteException)
118 {
119 m_log.Error("[SQLITE]: There was an issue loading the estate settings. This can happen the first time running OpenSimulator with CSharpSqlite the first time. OpenSimulator will probably crash, restart it and it should be good to go.");
120 }
112 121
113 IDataReader r = cmd.ExecuteReader(); 122 if (r != null && r.Read())
114
115 if (r.Read())
116 { 123 {
117 foreach (string name in FieldList) 124 foreach (string name in FieldList)
118 { 125 {