aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-05-07 21:42:23 +0000
committerAdam Frisby2008-05-07 21:42:23 +0000
commit5843f595a723cd37c6b95eac8e74f9d3586fff53 (patch)
tree0966fd8bed80042e14b49cfbf63da704017414d8
parent* Added Obsolete() tag to IClientAPI.OutPacket. (diff)
downloadopensim-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)
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs5
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs2
-rw-r--r--prebuild.xml12
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
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
diff --git a/prebuild.xml b/prebuild.xml
index 9696705..474e514 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -91,7 +91,6 @@
91 <Reference name="System.Xml"/> 91 <Reference name="System.Xml"/>
92 <Reference name="System.Data"/> 92 <Reference name="System.Data"/>
93 <Reference name="libsecondlife.dll"/> 93 <Reference name="libsecondlife.dll"/>
94 <Reference name="Db4objects.Db4o.dll"/>
95 <Reference name="XMLRPC.dll"/> 94 <Reference name="XMLRPC.dll"/>
96 <Reference name="OpenSim.Framework.Console"/> 95 <Reference name="OpenSim.Framework.Console"/>
97 <Reference name="Nini.dll" /> 96 <Reference name="Nini.dll" />
@@ -141,7 +140,6 @@
141 <Reference name="System.Xml"/> 140 <Reference name="System.Xml"/>
142 <Reference name="System.Data"/> 141 <Reference name="System.Data"/>
143 <Reference name="libsecondlife.dll"/> 142 <Reference name="libsecondlife.dll"/>
144 <Reference name="Db4objects.Db4o.dll"/>
145 <Reference name="XMLRPC.dll"/> 143 <Reference name="XMLRPC.dll"/>
146 <Reference name="OpenSim.Framework.Console"/> 144 <Reference name="OpenSim.Framework.Console"/>
147 <Reference name="OpenSim.Framework"/> 145 <Reference name="OpenSim.Framework"/>
@@ -324,7 +322,6 @@
324 <Reference name="System"/> 322 <Reference name="System"/>
325 <Reference name="System.Xml"/> 323 <Reference name="System.Xml"/>
326 <Reference name="libsecondlife.dll"/> 324 <Reference name="libsecondlife.dll"/>
327 <Reference name="Db4objects.Db4o.dll"/>
328 <Reference name="XMLRPC.dll"/> 325 <Reference name="XMLRPC.dll"/>
329 <Reference name="OpenSim.Framework"/> 326 <Reference name="OpenSim.Framework"/>
330 <Reference name="OpenSim.Framework.Console"/> 327 <Reference name="OpenSim.Framework.Console"/>
@@ -350,7 +347,6 @@
350 <Reference name="System"/> 347 <Reference name="System"/>
351 <Reference name="System.Xml"/> 348 <Reference name="System.Xml"/>
352 <Reference name="libsecondlife.dll"/> 349 <Reference name="libsecondlife.dll"/>
353 <Reference name="Db4objects.Db4o.dll"/>
354 <Reference name="XMLRPC.dll"/> 350 <Reference name="XMLRPC.dll"/>
355 <Reference name="OpenSim.Framework"/> 351 <Reference name="OpenSim.Framework"/>
356 <Reference name="OpenSim.Framework.Console"/> 352 <Reference name="OpenSim.Framework.Console"/>
@@ -403,7 +399,6 @@
403 <Reference name="System"/> 399 <Reference name="System"/>
404 <Reference name="System.Xml"/> 400 <Reference name="System.Xml"/>
405 <Reference name="libsecondlife.dll"/> 401 <Reference name="libsecondlife.dll"/>
406 <Reference name="Db4objects.Db4o.dll"/>
407 <Reference name="XMLRPC.dll"/> 402 <Reference name="XMLRPC.dll"/>
408 <Reference name="OpenSim.Framework"/> 403 <Reference name="OpenSim.Framework"/>
409 <Reference name="OpenSim.Framework.Console"/> 404 <Reference name="OpenSim.Framework.Console"/>
@@ -430,7 +425,6 @@
430 <Reference name="System"/> 425 <Reference name="System"/>
431 <Reference name="System.Xml"/> 426 <Reference name="System.Xml"/>
432 <Reference name="libsecondlife.dll"/> 427 <Reference name="libsecondlife.dll"/>
433 <Reference name="Db4objects.Db4o.dll"/>
434 <Reference name="XMLRPC.dll"/> 428 <Reference name="XMLRPC.dll"/>
435 <Reference name="OpenSim.Framework"/> 429 <Reference name="OpenSim.Framework"/>
436 <Reference name="OpenSim.Framework.Console"/> 430 <Reference name="OpenSim.Framework.Console"/>
@@ -668,7 +662,6 @@
668 <Reference name="OpenSim.Framework.Console"/> 662 <Reference name="OpenSim.Framework.Console"/>
669 <Reference name="OpenSim.Framework.Statistics"/> 663 <Reference name="OpenSim.Framework.Statistics"/>
670 <Reference name="libsecondlife.dll"/> 664 <Reference name="libsecondlife.dll"/>
671 <Reference name="Db4objects.Db4o.dll"/>
672 <Reference name="Nini.dll" /> 665 <Reference name="Nini.dll" />
673 <Reference name="XMLRPC.dll"/> 666 <Reference name="XMLRPC.dll"/>
674 <Reference name="log4net"/> 667 <Reference name="log4net"/>
@@ -796,7 +789,6 @@
796 <Reference name="System.Xml"/> 789 <Reference name="System.Xml"/>
797 <Reference name="libsecondlife.dll"/> 790 <Reference name="libsecondlife.dll"/>
798 <Reference name="Axiom.MathLib.dll"/> 791 <Reference name="Axiom.MathLib.dll"/>
799 <Reference name="Db4objects.Db4o.dll"/>
800 <Reference name="OpenSim.Region.Environment"/> 792 <Reference name="OpenSim.Region.Environment"/>
801 <Reference name="OpenSim.Framework"/> 793 <Reference name="OpenSim.Framework"/>
802 <Reference name="OpenSim.Data"/> 794 <Reference name="OpenSim.Data"/>
@@ -997,7 +989,6 @@
997 <Reference name="Mono.Addins.dll" /> 989 <Reference name="Mono.Addins.dll" />
998 <Reference name="libsecondlife.dll"/> 990 <Reference name="libsecondlife.dll"/>
999 <Reference name="Axiom.MathLib.dll"/> 991 <Reference name="Axiom.MathLib.dll"/>
1000 <Reference name="Db4objects.Db4o.dll"/>
1001 <Reference name="OpenSim.Framework"/> 992 <Reference name="OpenSim.Framework"/>
1002 <Reference name="OpenSim.Data"/> 993 <Reference name="OpenSim.Data"/>
1003 <Reference name="OpenSim.Framework.Console"/> 994 <Reference name="OpenSim.Framework.Console"/>
@@ -1287,7 +1278,6 @@
1287 <Reference name="OpenSim.Data"/> 1278 <Reference name="OpenSim.Data"/>
1288 <Reference name="OpenSim.Data.MySQL"/> 1279 <Reference name="OpenSim.Data.MySQL"/>
1289 <Reference name="libsecondlife.dll"/> 1280 <Reference name="libsecondlife.dll"/>
1290 <Reference name="Db4objects.Db4o.dll"/>
1291 <Reference name="XMLRPC.dll"/> 1281 <Reference name="XMLRPC.dll"/>
1292 <Reference name="log4net"/> 1282 <Reference name="log4net"/>
1293 1283
@@ -1350,7 +1340,6 @@
1350 <Reference name="OpenSim.Framework.Servers"/> 1340 <Reference name="OpenSim.Framework.Servers"/>
1351 <Reference name="OpenSim.Framework.Statistics"/> 1341 <Reference name="OpenSim.Framework.Statistics"/>
1352 <Reference name="libsecondlife.dll"/> 1342 <Reference name="libsecondlife.dll"/>
1353 <Reference name="Db4objects.Db4o.dll"/>
1354 <Reference name="XMLRPC.dll"/> 1343 <Reference name="XMLRPC.dll"/>
1355 <Reference name="log4net"/> 1344 <Reference name="log4net"/>
1356 1345
@@ -1633,7 +1622,6 @@
1633 <Reference name="Mono.Addins.dll" /> 1622 <Reference name="Mono.Addins.dll" />
1634 <Reference name="libsecondlife.dll"/> 1623 <Reference name="libsecondlife.dll"/>
1635 <Reference name="Axiom.MathLib.dll"/> 1624 <Reference name="Axiom.MathLib.dll"/>
1636 <Reference name="Db4objects.Db4o.dll"/>
1637 <Reference name="OpenSim"/> 1625 <Reference name="OpenSim"/>
1638 <Reference name="OpenSim.Framework"/> 1626 <Reference name="OpenSim.Framework"/>
1639 <Reference name="OpenSim.Data"/> 1627 <Reference name="OpenSim.Data"/>