aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-09-23 01:45:54 -0400
committerTeravus Ovares (Dan Olivares)2010-09-23 01:45:54 -0400
commitacd5bbdb71682131be386b7a5ce1904622b0ee70 (patch)
tree051cd991116c9d6b897b36f5b1cb514c80d83650 /OpenSim
parent* Add CSharpSqlite to prebuild (diff)
downloadopensim-SC_OLD-acd5bbdb71682131be386b7a5ce1904622b0ee70.zip
opensim-SC_OLD-acd5bbdb71682131be386b7a5ce1904622b0ee70.tar.gz
opensim-SC_OLD-acd5bbdb71682131be386b7a5ce1904622b0ee70.tar.bz2
opensim-SC_OLD-acd5bbdb71682131be386b7a5ce1904622b0ee70.tar.xz
* One more item for CSharpSqlite
* Hopefully this will enable mac people to use SQLite again * Someone cooler then me will need to figure out how to define CSharpSqlite with Mono so the conditional will pick up. * There's also an error that occurs when you first load OpenSimulator under CSharpSQLite that goes away after. * The databases are not byte for byte compatible. Mono.Data.Sqlite is able to read CSharpSqlite made databases but not the reverse way.
Diffstat (limited to 'OpenSim')
-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 {