Resolve merge commits, stage 1

2026-08-07 17:55:48 +08:00 · 2011-09-04 07:06:36 -07:00
parent 6ab5ca2bda 9f75eaf50e
commit 66dec3b874
267 changed files with 19393 additions and 5645 deletions
--- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Data.MSSQL
                    {
                        cmd.ExecuteNonQuery();
                    }
-                    catch (Exception e)
+                    catch (Exception)
                    {
                        return false;
                    }