aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Migration.cs
diff options
context:
space:
mode:
authorMelanie2010-10-05 02:12:35 +0100
committerMelanie2010-10-05 02:12:35 +0100
commitba0a19c228b8d9bce0a9fc2328e69ba48befab66 (patch)
treed20a2049e2b4f49908f60e21988cd6b0bfc02aaa /OpenSim/Data/Migration.cs
parentMake windlight set the default environment on start (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.zip
opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.gz
opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.bz2
opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data/Migration.cs')
-rw-r--r--OpenSim/Data/Migration.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index 2895a71..d606470 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -138,12 +138,12 @@ namespace OpenSim.Data
138 /// <param name="conn"></param> 138 /// <param name="conn"></param>
139 /// <param name="script">Array of strings, one-per-batch (often just one)</param> 139 /// <param name="script">Array of strings, one-per-batch (often just one)</param>
140 protected virtual void ExecuteScript(DbConnection conn, string[] script) 140 protected virtual void ExecuteScript(DbConnection conn, string[] script)
141 { 141 {
142 using (DbCommand cmd = conn.CreateCommand()) 142 using (DbCommand cmd = conn.CreateCommand())
143 { 143 {
144 cmd.CommandTimeout = 0; 144 cmd.CommandTimeout = 0;
145 foreach (string sql in script) 145 foreach (string sql in script)
146 { 146 {
147 cmd.CommandText = sql; 147 cmd.CommandText = sql;
148 try 148 try
149 { 149 {