From 5843f595a723cd37c6b95eac8e74f9d3586fff53 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Wed, 7 May 2008 21:42:23 +0000
Subject: * Fixed some compiler warnings * Fixed prebuild.xml to remove DB4o
 references (more compiler warnings)

---
 OpenSim/Data/NHibernate/NHibernateAssetData.cs     |  2 +-
 OpenSim/Data/NHibernate/NHibernateInventoryData.cs |  2 +-
 OpenSim/Data/NHibernate/NHibernateUserData.cs      |  5 +++--
 OpenSim/Data/SQLite/SQLiteRegionData.cs            |  2 +-
 prebuild.xml                                       | 12 ------------
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index c0dd322..e52f633 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 77b9b01..f8e3655 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 491cb2a..e680840 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 f1694ca..1b577db 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 9696705..474e514 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -91,7 +91,6 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="Nini.dll" />
@@ -141,7 +140,6 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Data"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework"/>
@@ -324,7 +322,6 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -350,7 +347,6 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -403,7 +399,6 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -430,7 +425,6 @@
       <Reference name="System"/>
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -668,7 +662,6 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="Nini.dll" />
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net"/>
@@ -796,7 +789,6 @@
       <Reference name="System.Xml"/>
       <Reference name="libsecondlife.dll"/>
       <Reference name="Axiom.MathLib.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="OpenSim.Region.Environment"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Data"/>
@@ -997,7 +989,6 @@
       <Reference name="Mono.Addins.dll" />
       <Reference name="libsecondlife.dll"/>
       <Reference name="Axiom.MathLib.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -1287,7 +1278,6 @@
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Data.MySQL"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net"/>
 
@@ -1350,7 +1340,6 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="libsecondlife.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net"/>
 
@@ -1633,7 +1622,6 @@
       <Reference name="Mono.Addins.dll" />
       <Reference name="libsecondlife.dll"/>
       <Reference name="Axiom.MathLib.dll"/>
-      <Reference name="Db4objects.Db4o.dll"/>
       <Reference name="OpenSim"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Data"/>
-- 
cgit v1.1