From b02fa17acceb80255dae5990b6e7ba549c43e928 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 22 Oct 2007 22:07:45 +0000
Subject: * Temporary fix for SQLite error -- temporarily disables terrain
 storage.

---
 .../Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Storage')

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
 
                 ds.Tables.Add(createTerrainTable());
                 setupTerrainCommands(terrainDa, conn);
-                terrainDa.Fill(ds.Tables["terrain"]);
                 
                 // WORKAROUND: This is a work around for sqlite on
                 // windows, which gets really unhappy with blob columns
@@ -99,10 +98,11 @@ namespace OpenSim.DataStore.MonoSqlite
                 try
                 {
                     shapeDa.Fill(ds.Tables["primshapes"]);
+                    terrainDa.Fill(ds.Tables["terrain"]);
                 }
                 catch (Exception)
                 {
-                    MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes table");
+                    MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes or terrain table");
                 }
                 return;
             }
-- 
cgit v1.1