diff options
author | Adam Frisby | 2008-05-07 21:42:23 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-07 21:42:23 +0000 |
commit | 5843f595a723cd37c6b95eac8e74f9d3586fff53 (patch) | |
tree | 0966fd8bed80042e14b49cfbf63da704017414d8 /OpenSim | |
parent | * Added Obsolete() tag to IClientAPI.OutPacket. (diff) | |
download | opensim-SC_OLD-5843f595a723cd37c6b95eac8e74f9d3586fff53.zip opensim-SC_OLD-5843f595a723cd37c6b95eac8e74f9d3586fff53.tar.gz opensim-SC_OLD-5843f595a723cd37c6b95eac8e74f9d3586fff53.tar.bz2 opensim-SC_OLD-5843f595a723cd37c6b95eac8e74f9d3586fff53.tar.xz |
* Fixed some compiler warnings
* Fixed prebuild.xml to remove DB4o references (more compiler warnings)
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateAssetData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 5 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 |
4 files changed, 6 insertions, 5 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 | |||
100 | using(ISession session = factory.OpenSession()) { | 100 | using(ISession session = factory.OpenSession()) { |
101 | session.Load(typeof(AssetBase), LLUUID.Zero); | 101 | session.Load(typeof(AssetBase), LLUUID.Zero); |
102 | } | 102 | } |
103 | } catch (ObjectNotFoundException e) { | 103 | } catch (ObjectNotFoundException) { |
104 | // yes, we know it's not there, but that's ok | 104 | // yes, we know it's not there, but that's ok |
105 | } catch (ADOException e) { | 105 | } catch (ADOException e) { |
106 | Match m = RE.Match(e.ToString()); | 106 | 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 | |||
98 | using(ISession session = factory.OpenSession()) { | 98 | using(ISession session = factory.OpenSession()) { |
99 | session.Load(typeof(InventoryItemBase), LLUUID.Zero); | 99 | session.Load(typeof(InventoryItemBase), LLUUID.Zero); |
100 | } | 100 | } |
101 | } catch (ObjectNotFoundException e) { | 101 | } catch (ObjectNotFoundException) { |
102 | // yes, we know it's not there, but that's ok | 102 | // yes, we know it's not there, but that's ok |
103 | } catch (ADOException e) { | 103 | } catch (ADOException e) { |
104 | Match m = RE.Match(e.ToString()); | 104 | 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 | |||
91 | using(ISession session = factory.OpenSession()) { | 91 | using(ISession session = factory.OpenSession()) { |
92 | session.Load(typeof(UserProfileData), LLUUID.Zero); | 92 | session.Load(typeof(UserProfileData), LLUUID.Zero); |
93 | } | 93 | } |
94 | } catch (ObjectNotFoundException e) { | 94 | } catch (ObjectNotFoundException) { |
95 | // yes, we know it's not there, but that's ok | 95 | // yes, we know it's not there, but that's ok |
96 | } catch (ADOException e) { | 96 | } catch (ADOException e) { |
97 | Match m = RE.Match(e.ToString()); | 97 | Match m = RE.Match(e.ToString()); |
@@ -109,7 +109,8 @@ namespace OpenSim.Data.NHibernate | |||
109 | using(ISession session = factory.OpenSession()) { | 109 | using(ISession session = factory.OpenSession()) { |
110 | user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; | 110 | user = session.Load(typeof(UserProfileData), uuid) as UserProfileData; |
111 | } | 111 | } |
112 | } catch (Exception e) {} | 112 | // BUG: CATCHALL IS BAD. |
113 | } catch (Exception) {} | ||
113 | 114 | ||
114 | return (user != null); | 115 | return (user != null); |
115 | } | 116 | } |
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 | |||
979 | { | 979 | { |
980 | Helpers.TryParse((string)row["AuthbuyerID"], out authBuyerID); | 980 | Helpers.TryParse((string)row["AuthbuyerID"], out authBuyerID); |
981 | } | 981 | } |
982 | catch (InvalidCastException e) | 982 | catch (InvalidCastException) |
983 | { | 983 | { |
984 | // Database table was created before we got here and now has null values :P | 984 | // Database table was created before we got here and now has null values :P |
985 | try | 985 | try |