aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-05-19 03:26:37 +0100
committerMelanie2010-05-19 03:26:37 +0100
commit20642f2f212d46a97bd48575dc059da327450520 (patch)
tree1dd5c70766d741f4e44ef18eefabcdc3a70257c2 /OpenSim
parentRemove the return that was inserted in the last merge to allow (diff)
downloadopensim-SC_OLD-20642f2f212d46a97bd48575dc059da327450520.zip
opensim-SC_OLD-20642f2f212d46a97bd48575dc059da327450520.tar.gz
opensim-SC_OLD-20642f2f212d46a97bd48575dc059da327450520.tar.bz2
opensim-SC_OLD-20642f2f212d46a97bd48575dc059da327450520.tar.xz
Fix the migration message to say "Continuing" again. Remove line feed, which
prevented the full message from displaying.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/Migration.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index ddf8078..987eab5 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Data
200 catch (Exception e) 200 catch (Exception e)
201 { 201 {
202 m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", kvp.Value.ToString()); 202 m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", kvp.Value.ToString());
203 m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}.\n 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. Migration aborted.", e.Message); 203 m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}. 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.", e.Message);
204 ExecuteScript("ROLLBACK;"); 204 ExecuteScript("ROLLBACK;");
205 } 205 }
206 206