diff options
| author | Melanie | 2010-10-06 00:27:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-06 00:27:10 +0100 |
| commit | d8149373c15d9ec39c0f836a337e58b633f45829 (patch) | |
| tree | 3678027b5eb7f1cdfb29b1c0c80bd0c3d7a62ae6 /OpenSim/Data | |
| parent | Avoid throwing errors when adding existing meshes to the render scene (diff) | |
| parent | Remove sirikata project (diff) | |
| download | opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.zip opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.gz opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.bz2 opensim-SC-d8149373c15d9ec39c0f836a337e58b633f45829.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/Migration.cs | 4 |
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 | { |