aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Data/NHibernate
parentThanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff)
downloadopensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.zip
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2
opensim-SC_OLD-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz
* optimized usings.
Diffstat (limited to 'OpenSim/Data/NHibernate')
-rw-r--r--OpenSim/Data/NHibernate/ColorUserType.cs4
-rw-r--r--OpenSim/Data/NHibernate/LLQuaternionUserType.cs2
-rw-r--r--OpenSim/Data/NHibernate/LLUUIDUserType.cs2
-rw-r--r--OpenSim/Data/NHibernate/LLVector3UserType.cs2
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs8
-rw-r--r--OpenSim/Data/NHibernate/NHibernateGridData.cs13
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs5
-rw-r--r--OpenSim/Data/NHibernate/NHibernateManager.cs6
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs6
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs6
-rw-r--r--OpenSim/Data/NHibernate/SByteType.cs2
-rw-r--r--OpenSim/Data/NHibernate/Terrain.cs2
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs10
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs10
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs9
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs8
-rw-r--r--OpenSim/Data/NHibernate/TextureUserType.cs4
-rw-r--r--OpenSim/Data/NHibernate/UInt16Type.cs2
-rw-r--r--OpenSim/Data/NHibernate/UInt32Type.cs2
-rw-r--r--OpenSim/Data/NHibernate/UInt64Type.cs2
-rw-r--r--OpenSim/Data/NHibernate/UserFriend.cs3
37 files changed, 40 insertions, 205 deletions
diff --git a/OpenSim/Data/NHibernate/ColorUserType.cs b/OpenSim/Data/NHibernate/ColorUserType.cs
index 1ebd07c..955a442 100644
--- a/OpenSim/Data/NHibernate/ColorUserType.cs
+++ b/OpenSim/Data/NHibernate/ColorUserType.cs
@@ -27,12 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse; 30using System.Drawing;
31using OpenSim.Framework;
32using NHibernate; 31using NHibernate;
33using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 33using NHibernate.UserTypes;
35using System.Drawing;
36 34
37namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
38{ 36{
diff --git a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
index 0cd5c6f..589d1e3 100644
--- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
+++ b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using NHibernate; 30using NHibernate;
32using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 32using NHibernate.UserTypes;
33using OpenMetaverse;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
diff --git a/OpenSim/Data/NHibernate/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
index a7781a3..5d62ef3 100644
--- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using NHibernate; 30using NHibernate;
32using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 32using NHibernate.UserTypes;
33using OpenMetaverse;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
index 25a2bc6..75b522f 100644
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -27,10 +27,10 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using NHibernate; 30using NHibernate;
32using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 32using NHibernate.UserTypes;
33using OpenMetaverse;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index d0046c6..f4527bf 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -25,16 +25,10 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections;
30using System.IO;
31using System.Reflection; 28using System.Reflection;
32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 29using log4net;
35using NHibernate; 30using OpenMetaverse;
36using OpenSim.Framework; 31using OpenSim.Framework;
37using Environment=NHibernate.Cfg.Environment;
38 32
39namespace OpenSim.Data.NHibernate 33namespace OpenSim.Data.NHibernate
40{ 34{
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs
index 07d9ab5..836c99e 100644
--- a/OpenSim/Data/NHibernate/NHibernateGridData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -27,15 +27,14 @@
27 27
28 28
29using System; 29using System;
30using System.Collections;
30using System.Collections.Generic; 31using System.Collections.Generic;
31using System.Text;
32using log4net;
33using System.Reflection; 32using System.Reflection;
34using OpenSim.Framework; 33using log4net;
35using NHibernate; 34using NHibernate;
36using NHibernate.Criterion; 35using NHibernate.Criterion;
37using System.Collections;
38using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework;
39 38
40namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
41{ 40{
@@ -93,7 +92,7 @@ namespace OpenSim.Data.NHibernate
93 } 92 }
94 } 93 }
95 94
96 public override bool AuthenticateSim(OpenMetaverse.UUID UUID, ulong regionHandle, string simrecvkey) 95 public override bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey)
97 { 96 {
98 bool throwHissyFit = false; // Should be true by 1.0 97 bool throwHissyFit = false; // Should be true by 1.0
99 98
@@ -147,7 +146,7 @@ namespace OpenSim.Data.NHibernate
147 return DataResponse.RESPONSE_ERROR; 146 return DataResponse.RESPONSE_ERROR;
148 } 147 }
149 148
150 public override RegionProfileData GetProfileByUUID(OpenMetaverse.UUID UUID) 149 public override RegionProfileData GetProfileByUUID(UUID UUID)
151 { 150 {
152 return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID); 151 return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID);
153 } 152 }
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index e648396..0129800 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -27,15 +27,12 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
31using System.Reflection; 30using System.Reflection;
32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 31using log4net;
35using NHibernate; 32using NHibernate;
36using NHibernate.Criterion; 33using NHibernate.Criterion;
34using OpenMetaverse;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using Environment=NHibernate.Cfg.Environment;
39 36
40namespace OpenSim.Data.NHibernate 37namespace OpenSim.Data.NHibernate
41{ 38{
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index 5e5eb47..51467da 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -26,14 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Data.Common;
29using System.Reflection; 30using System.Reflection;
30using System.IO;
31using log4net; 31using log4net;
32using NHibernate; 32using NHibernate;
33using NHibernate.Cfg; 33using NHibernate.Cfg;
34using NHibernate.Tool.hbm2ddl; 34using NHibernate.Tool.hbm2ddl;
35using OpenMetaverse; 35using OpenMetaverse;
36using Environment = NHibernate.Cfg.Environment; 36using Environment=NHibernate.Cfg.Environment;
37 37
38namespace OpenSim.Data.NHibernate 38namespace OpenSim.Data.NHibernate
39{ 39{
@@ -92,7 +92,7 @@ namespace OpenSim.Data.NHibernate
92 migrationSubType = "MySQLDialect"; 92 migrationSubType = "MySQLDialect";
93 } 93 }
94 94
95 Migration migration = new Migration((System.Data.Common.DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store); 95 Migration migration = new Migration((DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
96 migration.Update(); 96 migration.Update();
97 } 97 }
98 98
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 29f4106..0cd3969 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -26,19 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.IO;
32using System.Reflection; 30using System.Reflection;
33using System.Text.RegularExpressions;
34using OpenMetaverse;
35using log4net; 31using log4net;
36using NHibernate; 32using NHibernate;
37using NHibernate.Criterion; 33using NHibernate.Criterion;
34using OpenMetaverse;
38using OpenSim.Framework; 35using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
41using Environment = NHibernate.Cfg.Environment;
42 38
43namespace OpenSim.Data.NHibernate 39namespace OpenSim.Data.NHibernate
44{ 40{
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index c739c86..7dfdcb5 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -25,17 +25,13 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.IO;
31using System.Reflection; 29using System.Reflection;
32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 30using log4net;
35using NHibernate; 31using NHibernate;
36using NHibernate.Criterion; 32using NHibernate.Criterion;
33using OpenMetaverse;
37using OpenSim.Framework; 34using OpenSim.Framework;
38using Environment=NHibernate.Cfg.Environment;
39 35
40namespace OpenSim.Data.NHibernate 36namespace OpenSim.Data.NHibernate
41{ 37{
diff --git a/OpenSim/Data/NHibernate/SByteType.cs b/OpenSim/Data/NHibernate/SByteType.cs
index 0d8431d..f41cb33 100644
--- a/OpenSim/Data/NHibernate/SByteType.cs
+++ b/OpenSim/Data/NHibernate/SByteType.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
index 88be17f..292b3b4 100644
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework;
32using log4net; 31using log4net;
33using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
index d6c7f8f..8296556 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 55 }
63 catch (Exception e) 56 catch (Exception e)
64 { 57 {
65 System.Console.WriteLine("Exception {0}", e); 58 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 59 Assert.Ignore();
67 } 60 }
68 } 61 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
index e70b32b..9aa1ba8 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse;
37using OpenSim.Data.NHibernate;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
index 7500574..c3c2c93 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
@@ -26,16 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
41{ 33{
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 54 }
63 catch (Exception e) 55 catch (Exception e)
64 { 56 {
65 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 58 Assert.Ignore();
67 } 59 }
68 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
index add8883..5cf0a5b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 55 }
63 catch (Exception e) 56 catch (Exception e)
64 { 57 {
65 System.Console.WriteLine("Exception {0}", e); 58 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 59 Assert.Ignore();
67 } 60 }
68 } 61 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
index 01b0236..2b0da74 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
index 93b92ed..96194c6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
index c845d2c..60b197c 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse;
37using OpenSim.Data.NHibernate;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
index f91d058..8415fdf 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
@@ -26,16 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
41{ 33{
@@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 54 }
63 catch (Exception e) 55 catch (Exception e)
64 { 56 {
65 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 58 Assert.Ignore();
67 } 59 }
68 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
index 4db8375..89ab928 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 55 }
63 catch (Exception e) 56 catch (Exception e)
64 { 57 {
65 System.Console.WriteLine("Exception {0}", e); 58 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 59 Assert.Ignore();
67 } 60 }
68 } 61 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
index 3bc0f4b..a50df9b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
index 50632d1..33a36e6 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
@@ -26,14 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenMetaverse;
37 31
38namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
39{ 33{
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
60 } 54 }
61 catch (Exception e) 55 catch (Exception e)
62 { 56 {
63 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
64 Assert.Ignore(); 58 Assert.Ignore();
65 } 59 }
66 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
index a6e9891..93f1ee1 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
@@ -26,14 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenMetaverse;
36using OpenSim.Data.NHibernate;
37 31
38namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
39{ 33{
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
60 } 54 }
61 catch (Exception e) 55 catch (Exception e)
62 { 56 {
63 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
64 Assert.Ignore(); 58 Assert.Ignore();
65 } 59 }
66 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
index 057996b..afad336 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
@@ -26,15 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenMetaverse;
37using log4net;
38 31
39namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 54 }
62 catch (Exception e) 55 catch (Exception e)
63 { 56 {
64 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 58 Assert.Ignore();
66 } 59 }
67 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
index 4fc89f8..9967af7 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
@@ -26,14 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenMetaverse;
37 31
38namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
39{ 33{
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
60 } 54 }
61 catch (Exception e) 55 catch (Exception e)
62 { 56 {
63 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
64 Assert.Ignore(); 58 Assert.Ignore();
65 } 59 }
66 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
index 1abf97b..0edfdcb 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
@@ -26,14 +26,8 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 29using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 30using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenMetaverse;
37 31
38namespace OpenSim.Data.NHibernate.Tests 32namespace OpenSim.Data.NHibernate.Tests
39{ 33{
@@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
60 } 54 }
61 catch (Exception e) 55 catch (Exception e)
62 { 56 {
63 System.Console.WriteLine("Exception {0}", e); 57 Console.WriteLine("Exception {0}", e);
64 Assert.Ignore(); 58 Assert.Ignore();
65 } 59 }
66 } 60 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
index 77bbb08..cc4915b 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
@@ -27,14 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 32
39namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
40{ 34{
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 56 }
63 catch (Exception e) 57 catch (Exception e)
64 { 58 {
65 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 60 Assert.Ignore();
67 } 61 }
68 } 62 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
index 6e7d7af..a358b27 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
@@ -27,14 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse;
37using OpenSim.Data.NHibernate;
38 32
39namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
40{ 34{
@@ -61,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
61 } 55 }
62 catch (Exception e) 56 catch (Exception e)
63 { 57 {
64 System.Console.WriteLine("Exception {0}", e); 58 Console.WriteLine("Exception {0}", e);
65 Assert.Ignore(); 59 Assert.Ignore();
66 } 60 }
67 } 61 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
index 45c77f7..297a661 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
@@ -27,15 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 32
40namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
41{ 34{
@@ -63,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
63 } 56 }
64 catch (Exception e) 57 catch (Exception e)
65 { 58 {
66 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
67 Assert.Ignore(); 60 Assert.Ignore();
68 } 61 }
69 } 62 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
index 6e84110..f188736 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
@@ -27,14 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 32
39namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
40{ 34{
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 56 }
63 catch (Exception e) 57 catch (Exception e)
64 { 58 {
65 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 60 Assert.Ignore();
67 } 61 }
68 } 62 }
diff --git a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
index 90edbc2..d94dac0 100644
--- a/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
+++ b/OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
@@ -27,14 +27,8 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using NUnit.Framework; 30using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Framework;
34using OpenSim.Data.Tests; 31using OpenSim.Data.Tests;
35using OpenSim.Data.NHibernate;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 32
39namespace OpenSim.Data.NHibernate.Tests 33namespace OpenSim.Data.NHibernate.Tests
40{ 34{
@@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
62 } 56 }
63 catch (Exception e) 57 catch (Exception e)
64 { 58 {
65 System.Console.WriteLine("Exception {0}", e); 59 Console.WriteLine("Exception {0}", e);
66 Assert.Ignore(); 60 Assert.Ignore();
67 } 61 }
68 } 62 }
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index ff949d4..57a580d 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -27,11 +27,11 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
33using OpenMetaverse;
34using OpenSim.Framework;
35 35
36namespace OpenSim.Data.NHibernate 36namespace OpenSim.Data.NHibernate
37{ 37{
diff --git a/OpenSim/Data/NHibernate/UInt16Type.cs b/OpenSim/Data/NHibernate/UInt16Type.cs
index b805288..907e832 100644
--- a/OpenSim/Data/NHibernate/UInt16Type.cs
+++ b/OpenSim/Data/NHibernate/UInt16Type.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UInt32Type.cs b/OpenSim/Data/NHibernate/UInt32Type.cs
index 2500194..2b4c24a 100644
--- a/OpenSim/Data/NHibernate/UInt32Type.cs
+++ b/OpenSim/Data/NHibernate/UInt32Type.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UInt64Type.cs b/OpenSim/Data/NHibernate/UInt64Type.cs
index 304c9371..362e62d 100644
--- a/OpenSim/Data/NHibernate/UInt64Type.cs
+++ b/OpenSim/Data/NHibernate/UInt64Type.cs
@@ -27,8 +27,6 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using OpenMetaverse;
31using OpenSim.Framework;
32using NHibernate; 30using NHibernate;
33using NHibernate.SqlTypes; 31using NHibernate.SqlTypes;
34using NHibernate.UserTypes; 32using NHibernate.UserTypes;
diff --git a/OpenSim/Data/NHibernate/UserFriend.cs b/OpenSim/Data/NHibernate/UserFriend.cs
index ab6cd78..589acd1 100644
--- a/OpenSim/Data/NHibernate/UserFriend.cs
+++ b/OpenSim/Data/NHibernate/UserFriend.cs
@@ -25,9 +25,6 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 28using OpenMetaverse;
32 29
33namespace OpenSim.Data.NHibernate 30namespace OpenSim.Data.NHibernate