OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixed some compiler warnings 

* Fixed prebuild.xml to remove DB4o references (more compiler warnings)
0.6.0-stable
Adam Frisby 2008-05-07 21:42:23 +00:00
parent 17366af846
commit 5843f595a7
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/NHibernate/NHibernateAssetData.cs
View File

@ -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());

2
OpenSim/Data/NHibernate/NHibernateInventoryData.cs
View File

@ -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());

5
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

@ -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);
}

2
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

@ -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

12
prebuild.xml
View File

@ -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"/>