diff options
author | Adam Frisby | 2007-10-22 22:07:45 +0000 |
---|---|---|
committer | Adam Frisby | 2007-10-22 22:07:45 +0000 |
commit | b02fa17acceb80255dae5990b6e7ba549c43e928 (patch) | |
tree | 622fd14d08300d926a10eb91c6bccf993eeb4158 /OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | |
parent | * Return of R2162. /Take that SVN!/ (diff) | |
download | opensim-SC_OLD-b02fa17acceb80255dae5990b6e7ba549c43e928.zip opensim-SC_OLD-b02fa17acceb80255dae5990b6e7ba549c43e928.tar.gz opensim-SC_OLD-b02fa17acceb80255dae5990b6e7ba549c43e928.tar.bz2 opensim-SC_OLD-b02fa17acceb80255dae5990b6e7ba549c43e928.tar.xz |
* Temporary fix for SQLite error -- temporarily disables terrain storage.
Diffstat (limited to 'OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs')
-rw-r--r-- | OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs index cc0ff7a..e5b9cc0 100644 --- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs +++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs | |||
@@ -90,7 +90,6 @@ namespace OpenSim.DataStore.MonoSqlite | |||
90 | 90 | ||
91 | ds.Tables.Add(createTerrainTable()); | 91 | ds.Tables.Add(createTerrainTable()); |
92 | setupTerrainCommands(terrainDa, conn); | 92 | setupTerrainCommands(terrainDa, conn); |
93 | terrainDa.Fill(ds.Tables["terrain"]); | ||
94 | 93 | ||
95 | // WORKAROUND: This is a work around for sqlite on | 94 | // WORKAROUND: This is a work around for sqlite on |
96 | // windows, which gets really unhappy with blob columns | 95 | // windows, which gets really unhappy with blob columns |
@@ -99,10 +98,11 @@ namespace OpenSim.DataStore.MonoSqlite | |||
99 | try | 98 | try |
100 | { | 99 | { |
101 | shapeDa.Fill(ds.Tables["primshapes"]); | 100 | shapeDa.Fill(ds.Tables["primshapes"]); |
101 | terrainDa.Fill(ds.Tables["terrain"]); | ||
102 | } | 102 | } |
103 | catch (Exception) | 103 | catch (Exception) |
104 | { | 104 | { |
105 | MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes table"); | 105 | MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes or terrain table"); |
106 | } | 106 | } |
107 | return; | 107 | return; |
108 | } | 108 | } |