diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLXInventoryData.cs')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLXInventoryData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | } |