Make Migratons continue int he face of an error. This is required for the

friends migration, which MAY error out if the old friends table is not
in the same database as the new one being created. This error is nonfatal,
it would only mean that friends will not be migrated automatically. It would
bite people with nonstandard configurations.

1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index e51dc22..5a9b01b 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -138,7 +138,14 @@ namespace OpenSim.Data
                 cmd.CommandText = kvp.Value;
                 // we need to up the command timeout to infinite as we might be doing long migrations.
                 cmd.CommandTimeout = 0;
-                cmd.ExecuteNonQuery();
+                try
+                {
+                    cmd.ExecuteNonQuery();
+                }
+                catch (Exception e)
+                {
+                    m_log.Debug("[MIGRATIONS]: An error has occurred in the migration. This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.");
+                }
 
                 if (version == 0)
                 {