diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs index c0dd32295c..e52f633b66 100644 --- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs +++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs @@ -100,7 +100,7 @@ namespace OpenSim.Data.NHibernate using(ISession session = factory.OpenSession()) { session.Load(typeof(AssetBase), LLUUID.Zero); } - } catch (ObjectNotFoundException e) { + } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index 77b9b01631..f8e3655829 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs @@ -98,7 +98,7 @@ namespace OpenSim.Data.NHibernate using(ISession session = factory.OpenSession()) { session.Load(typeof(InventoryItemBase), LLUUID.Zero); } - } catch (ObjectNotFoundException e) { + } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 491cb2a31b..e680840252 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs @@ -91,7 +91,7 @@ namespace OpenSim.Data.NHibernate using(ISession session = factory.OpenSession()) { session.Load(typeof(UserProfileData), LLUUID.Zero); } - } catch (ObjectNotFoundException e) { + } catch (ObjectNotFoundException) { // yes, we know it's not there, but that's ok } catch (ADOException e) { Match m = RE.Match(e.ToString()); @@ -109,7 +109,8 @@ namespace OpenSim.Data.NHibernate using(ISession session = factory.OpenSession()) { user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; } - } catch (Exception e) {} + // BUG: CATCHALL IS BAD. + } catch (Exception) {} return (user != null); } diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index f1694cac77..1b577db6d6 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -979,7 +979,7 @@ namespace OpenSim.Data.SQLite { Helpers.TryParse((string)row["AuthbuyerID"], out authBuyerID); } - catch (InvalidCastException e) + catch (InvalidCastException) { // Database table was created before we got here and now has null values :P try diff --git a/prebuild.xml b/prebuild.xml index 96967056ec..474e5141fa 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -91,7 +91,6 @@ - @@ -141,7 +140,6 @@ - @@ -324,7 +322,6 @@ - @@ -350,7 +347,6 @@ - @@ -403,7 +399,6 @@ - @@ -430,7 +425,6 @@ - @@ -668,7 +662,6 @@ - @@ -796,7 +789,6 @@ - @@ -997,7 +989,6 @@ - @@ -1287,7 +1278,6 @@ - @@ -1350,7 +1340,6 @@ - @@ -1633,7 +1622,6 @@ -