diff options
| author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
| commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
| tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /OpenSim/Data/MSSQL | |
| parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
| parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
| download | opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz | |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Data/MSSQL')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLMigration.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLXInventoryData.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs index 1aa96c7..c2fecef 100644 --- a/OpenSim/Data/MSSQL/MSSQLMigration.cs +++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs | |||
| @@ -88,7 +88,7 @@ namespace OpenSim.Data.MSSQL | |||
| 88 | cmd.ExecuteNonQuery(); | 88 | cmd.ExecuteNonQuery(); |
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| 91 | catch (Exception ex) | 91 | catch (Exception) |
| 92 | { | 92 | { |
| 93 | throw new Exception(sql); | 93 | throw new Exception(sql); |
| 94 | 94 | ||
diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs index 10b0f29..b19a0da 100644 --- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs | |||
| @@ -191,7 +191,7 @@ namespace OpenSim.Data.MSSQL | |||
| 191 | { | 191 | { |
| 192 | cmd.ExecuteNonQuery(); | 192 | cmd.ExecuteNonQuery(); |
| 193 | } | 193 | } |
| 194 | catch (Exception e) | 194 | catch (Exception) |
| 195 | { | 195 | { |
| 196 | return false; | 196 | return false; |
| 197 | } | 197 | } |