aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Data
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 '')
-rw-r--r--OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLAssetData.cs6
-rw-r--r--OpenSim/Data/MSSQL/MSSQLEstateData.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLInventoryData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs4
-rw-r--r--OpenSim/Data/MSSQL/MSSQLMigration.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs2
-rw-r--r--OpenSim/Data/Migration.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs12
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs11
-rw-r--r--OpenSim/Data/MySQL/MySQLGridData.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLLogData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs5
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs9
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs9
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLGridTest.cs9
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs10
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs9
-rw-r--r--OpenSim/Data/MySQL/Tests/MySQLUserTest.cs9
-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
-rw-r--r--OpenSim/Data/RegionProfileData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteAssetData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs9
-rw-r--r--OpenSim/Data/SQLite/SQLiteGridData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteManager.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs5
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs4
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs9
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs7
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs10
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs9
-rw-r--r--OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs9
-rw-r--r--OpenSim/Data/Tests/BasicAssetTest.cs8
-rw-r--r--OpenSim/Data/Tests/BasicEstateTest.cs9
-rw-r--r--OpenSim/Data/Tests/BasicGridTest.cs6
-rw-r--r--OpenSim/Data/Tests/BasicInventoryTest.cs8
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs13
-rw-r--r--OpenSim/Data/Tests/BasicUserTest.cs7
-rw-r--r--OpenSim/Data/UserDataBase.cs2
81 files changed, 120 insertions, 388 deletions
diff --git a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
index 9211747..f992c16 100644
--- a/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
+++ b/OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
@@ -25,8 +25,8 @@
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.Data.SqlClient;
29using System.Data; 28using System.Data;
29using System.Data.SqlClient;
30 30
31namespace OpenSim.Data.MSSQL 31namespace OpenSim.Data.MSSQL
32{ 32{
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index 425e233..27deef7 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -28,8 +28,8 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34 34
35namespace OpenSim.Data.MSSQL 35namespace OpenSim.Data.MSSQL
@@ -71,7 +71,7 @@ namespace OpenSim.Data.MSSQL
71 /// <param name="connectionString">connect string</param> 71 /// <param name="connectionString">connect string</param>
72 override public void Initialise(string connectionString) 72 override public void Initialise(string connectionString)
73 { 73 {
74 TicksToEpoch = new System.DateTime(1970, 1, 1).Ticks; 74 TicksToEpoch = new DateTime(1970, 1, 1).Ticks;
75 75
76 if (!string.IsNullOrEmpty(connectionString)) 76 if (!string.IsNullOrEmpty(connectionString))
77 { 77 {
@@ -162,7 +162,7 @@ namespace OpenSim.Data.MSSQL
162 " VALUES " + 162 " VALUES " +
163 "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)")) 163 "(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)"))
164 { 164 {
165 int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); 165 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
166 command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID)); 166 command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID));
167 command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name)); 167 command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name));
168 command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description)); 168 command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description));
diff --git a/OpenSim/Data/MSSQL/MSSQLEstateData.cs b/OpenSim/Data/MSSQL/MSSQLEstateData.cs
index 8fd47a0..815e7ff 100644
--- a/OpenSim/Data/MSSQL/MSSQLEstateData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLEstateData.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 *
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37 37
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 7c7a886..eec2091 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
index 764b89d..f367d78 100644
--- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 562fbad..c687c89 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -31,8 +31,8 @@ using System.Data;
31using System.Data.SqlClient; 31using System.Data.SqlClient;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using OpenMetaverse;
35using log4net; 34using log4net;
35using OpenMetaverse;
36 36
37namespace OpenSim.Data.MSSQL 37namespace OpenSim.Data.MSSQL
38{ 38{
@@ -219,7 +219,7 @@ namespace OpenSim.Data.MSSQL
219 { 219 {
220 return value.ToString(); 220 return value.ToString();
221 } 221 }
222 if (valueType == typeof(OpenMetaverse.UUID)) 222 if (valueType == typeof(UUID))
223 { 223 {
224 return value.ToString(); 224 return value.ToString();
225 } 225 }
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs
index baa25d5..aea31c9 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -26,11 +26,9 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Data; 29using System.Data;
31using System.Data.Common; 30using System.Data.Common;
32using System.Reflection; 31using System.Reflection;
33using System.Text;
34 32
35namespace OpenSim.Data.MSSQL 33namespace OpenSim.Data.MSSQL
36{ 34{
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index d77afc9..44b042e 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -32,8 +32,8 @@ using System.Data.SqlClient;
32using System.Drawing; 32using System.Drawing;
33using System.IO; 33using System.IO;
34using System.Reflection; 34using System.Reflection;
35using OpenMetaverse;
36using log4net; 35using log4net;
36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 4524736..453941f 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -31,8 +31,8 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Data.SqlClient; 32using System.Data.SqlClient;
33using System.Reflection; 33using System.Reflection;
34using OpenMetaverse;
35using log4net; 34using log4net;
35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37 37
38namespace OpenSim.Data.MSSQL 38namespace OpenSim.Data.MSSQL
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index a9945b6..cbab546 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Data
70 70
71 public class Migration 71 public class Migration
72 { 72 {
73 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 73 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
74 74
75 private string _type; 75 private string _type;
76 private DbConnection _conn; 76 private DbConnection _conn;
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 823fa78..508e053 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -26,15 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Data; 29using System.Data;
31using System.Reflection; 30using System.Reflection;
32using OpenMetaverse;
33using log4net; 31using log4net;
34using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
33using OpenMetaverse;
35using OpenSim.Framework; 34using OpenSim.Framework;
36 35
37
38namespace OpenSim.Data.MySQL 36namespace OpenSim.Data.MySQL
39{ 37{
40 /// <summary> 38 /// <summary>
@@ -62,7 +60,7 @@ namespace OpenSim.Data.MySQL
62 /// <param name="connect">connect string</param> 60 /// <param name="connect">connect string</param>
63 override public void Initialise(string connect) 61 override public void Initialise(string connect)
64 { 62 {
65 TicksToEpoch = new System.DateTime(1970,1,1).Ticks; 63 TicksToEpoch = new DateTime(1970,1,1).Ticks;
66 64
67 // TODO: This will let you pass in the connect string in 65 // TODO: This will let you pass in the connect string in
68 // the config, though someone will need to write that. 66 // the config, though someone will need to write that.
@@ -145,7 +143,7 @@ namespace OpenSim.Data.MySQL
145 { 143 {
146 asset.Metadata.Local = (bool)dbReader["local"]; 144 asset.Metadata.Local = (bool)dbReader["local"];
147 } 145 }
148 catch (System.InvalidCastException) 146 catch (InvalidCastException)
149 { 147 {
150 asset.Metadata.Local = false; 148 asset.Metadata.Local = false;
151 } 149 }
@@ -199,7 +197,7 @@ namespace OpenSim.Data.MySQL
199 using (cmd) 197 using (cmd)
200 { 198 {
201 // create unix epoch time 199 // create unix epoch time
202 int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); 200 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
203 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID); 201 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
204 cmd.Parameters.AddWithValue("?name", asset.Metadata.Name); 202 cmd.Parameters.AddWithValue("?name", asset.Metadata.Name);
205 cmd.Parameters.AddWithValue("?description", asset.Metadata.Description); 203 cmd.Parameters.AddWithValue("?description", asset.Metadata.Description);
@@ -240,7 +238,7 @@ namespace OpenSim.Data.MySQL
240 using (cmd) 238 using (cmd)
241 { 239 {
242 // create unix epoch time 240 // create unix epoch time
243 int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000); 241 int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
244 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID); 242 cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
245 cmd.Parameters.AddWithValue("?access_time", now); 243 cmd.Parameters.AddWithValue("?access_time", now);
246 cmd.ExecuteNonQuery(); 244 cmd.ExecuteNonQuery();
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index f811d84..5acbb9d 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -28,15 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO;
32using System.Reflection; 31using System.Reflection;
33using System.Threading;
34using OpenMetaverse;
35using log4net; 32using log4net;
36using MySql.Data.MySqlClient; 33using MySql.Data.MySqlClient;
34using OpenMetaverse;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40 37
41namespace OpenSim.Data.MySQL 38namespace OpenSim.Data.MySQL
42{ 39{
@@ -131,7 +128,7 @@ namespace OpenSim.Data.MySQL
131 cmd.Dispose(); 128 cmd.Dispose();
132 } 129 }
133 130
134 m_lastConnectionUse = System.DateTime.Now.Ticks; 131 m_lastConnectionUse = DateTime.Now.Ticks;
135 132
136 m_log.DebugFormat( 133 m_log.DebugFormat(
137 "[REGION DB]: Connection wait timeout {0} seconds", 134 "[REGION DB]: Connection wait timeout {0} seconds",
@@ -140,7 +137,7 @@ namespace OpenSim.Data.MySQL
140 137
141 protected void CheckConnection() 138 protected void CheckConnection()
142 { 139 {
143 long timeNow = System.DateTime.Now.Ticks; 140 long timeNow = DateTime.Now.Ticks;
144 if (timeNow - m_lastConnectionUse > m_waitTimeout || 141 if (timeNow - m_lastConnectionUse > m_waitTimeout ||
145 m_connection.State != ConnectionState.Open) 142 m_connection.State != ConnectionState.Open)
146 { 143 {
@@ -185,7 +182,7 @@ namespace OpenSim.Data.MySQL
185 else 182 else
186 m_FieldMap[name].SetValue(es, false); 183 m_FieldMap[name].SetValue(es, false);
187 } 184 }
188 else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) 185 else if (m_FieldMap[name].GetValue(es) is UUID)
189 { 186 {
190 UUID uuid = UUID.Zero; 187 UUID uuid = UUID.Zero;
191 188
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 437747b..5c00330 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -29,8 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse; 32using System.Threading;
33using log4net; 33using log4net;
34using OpenMetaverse;
34using OpenSim.Framework; 35using OpenSim.Framework;
35 36
36namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
@@ -78,7 +79,7 @@ namespace OpenSim.Data.MySQL
78 if (lockedCons > m_maxConnections) 79 if (lockedCons > m_maxConnections)
79 { 80 {
80 lockedCons = 0; 81 lockedCons = 0;
81 System.Threading.Thread.Sleep(1000); // Wait some time before searching them again. 82 Thread.Sleep(1000); // Wait some time before searching them again.
82 m_log.Debug( 83 m_log.Debug(
83 "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound."); 84 "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
84 } 85 }
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index efc781d..7d29061 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using MySql.Data.MySqlClient; 32using MySql.Data.MySqlClient;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36namespace OpenSim.Data.MySQL 36namespace OpenSim.Data.MySQL
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index c02016c..13361af 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -25,8 +25,8 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System; 27using System;
28using System.Reflection;
29using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Reflection;
30using log4net; 30using log4net;
31using OpenSim.Framework; 31using OpenSim.Framework;
32 32
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index f16795e..3bb6857 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -26,14 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using OpenMetaverse;
35using log4net; 34using log4net;
36using MySql.Data.MySqlClient; 35using MySql.Data.MySqlClient;
36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38 38
39namespace OpenSim.Data.MySQL 39namespace OpenSim.Data.MySQL
@@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL
148 cmd.Dispose(); 148 cmd.Dispose();
149 } 149 }
150 150
151 m_lastConnectionUse = System.DateTime.Now.Ticks; 151 m_lastConnectionUse = DateTime.Now.Ticks;
152 152
153 m_log.DebugFormat( 153 m_log.DebugFormat(
154 "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond); 154 "[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond);
@@ -161,7 +161,7 @@ namespace OpenSim.Data.MySQL
161 { 161 {
162 //m_log.Debug("[REGION DB]: Checking connection"); 162 //m_log.Debug("[REGION DB]: Checking connection");
163 163
164 long timeNow = System.DateTime.Now.Ticks; 164 long timeNow = DateTime.Now.Ticks;
165 if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open) 165 if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open)
166 { 166 {
167 m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting"); 167 m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting");
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index ab55ba5..4b07ed6 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -28,13 +28,13 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Drawing;
31using System.IO; 32using System.IO;
32using System.Reflection; 33using System.Reflection;
33using System.Threading; 34using System.Threading;
34using System.Drawing;
35using OpenMetaverse;
36using log4net; 35using log4net;
37using MySql.Data.MySqlClient; 36using MySql.Data.MySqlClient;
37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
@@ -89,7 +89,7 @@ namespace OpenSim.Data.MySQL
89 } 89 }
90 catch (Exception) 90 catch (Exception)
91 { 91 {
92 System.Threading.Thread.Sleep(500); 92 Thread.Sleep(500);
93 93
94 m_Connection.Close(); 94 m_Connection.Close();
95 m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone(); 95 m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
122 } 122 }
123 catch (Exception) 123 catch (Exception)
124 { 124 {
125 System.Threading.Thread.Sleep(500); 125 Thread.Sleep(500);
126 126
127 m_Connection.Close(); 127 m_Connection.Close();
128 m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone(); 128 m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index f6a9af3..0f167b2 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -31,8 +31,9 @@ using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using OpenMetaverse; 34using System.Threading;
35using log4net; 35using log4net;
36using OpenMetaverse;
36using OpenSim.Framework; 37using OpenSim.Framework;
37 38
38namespace OpenSim.Data.MySQL 39namespace OpenSim.Data.MySQL
@@ -93,7 +94,7 @@ namespace OpenSim.Data.MySQL
93 if (lockedCons > m_maxConnections) 94 if (lockedCons > m_maxConnections)
94 { 95 {
95 lockedCons = 0; 96 lockedCons = 0;
96 System.Threading.Thread.Sleep(1000); // Wait some time before searching them again. 97 Thread.Sleep(1000); // Wait some time before searching them again.
97 m_log.Debug( 98 m_log.Debug(
98 "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound."); 99 "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
99 m_log.Debug("Current connections-in-use dump:"); 100 m_log.Debug("Current connections-in-use dump:");
diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
index 0f7c9cd..d03e66c 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.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.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.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/MySQL/Tests/MySQLEstateTest.cs b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
index bee3d04..f148385 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLEstateTest.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.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -63,7 +56,7 @@ namespace OpenSim.Data.MySQL.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/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index 4638bca..953294f 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.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.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.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/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index 8c7d820..e03e38d 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.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.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
41{ 33{
@@ -62,7 +54,7 @@ namespace OpenSim.Data.MySQL.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/MySQL/Tests/MySQLRegionTest.cs b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
index 71e73c2..5cce53b 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLRegionTest.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.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.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/MySQL/Tests/MySQLUserTest.cs b/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
index 8448dd7..b74617e 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLUserTest.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.MySQL;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.MySQL.Tests 32namespace OpenSim.Data.MySQL.Tests
40{ 33{
@@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.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/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
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 0ec79ac..d01aaa0 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -27,8 +27,8 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using OpenMetaverse;
31using Nwc.XmlRpc; 30using Nwc.XmlRpc;
31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33 33
34namespace OpenSim.Data 34namespace OpenSim.Data
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index d28956f..f6f62a7 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -28,9 +28,9 @@
28using System; 28using System;
29using System.Data; 29using System.Data;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using Mono.Data.SqliteClient; 32using Mono.Data.SqliteClient;
33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 46d29a3..3fb33c2 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -28,15 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.IO;
32using System.Reflection; 31using System.Reflection;
33using System.Threading;
34using OpenMetaverse;
35using Mono.Data.SqliteClient;
36using log4net; 32using log4net;
33using Mono.Data.SqliteClient;
34using OpenMetaverse;
37using OpenSim.Framework; 35using OpenSim.Framework;
38using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes;
40 37
41namespace OpenSim.Data.SQLite 38namespace OpenSim.Data.SQLite
42{ 39{
@@ -109,7 +106,7 @@ namespace OpenSim.Data.SQLite
109 else 106 else
110 m_FieldMap[name].SetValue(es, false); 107 m_FieldMap[name].SetValue(es, false);
111 } 108 }
112 else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID) 109 else if (m_FieldMap[name].GetValue(es) is UUID)
113 { 110 {
114 UUID uuid = UUID.Zero; 111 UUID uuid = UUID.Zero;
115 112
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 5b0455d..6c7c58c 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -29,10 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using System.Security.Cryptography;
33using System.Text;
34using OpenMetaverse;
35using log4net; 32using log4net;
33using OpenMetaverse;
36using OpenSim.Framework; 34using OpenSim.Framework;
37 35
38namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index c497396..6391c6d 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
diff --git a/OpenSim/Data/SQLite/SQLiteManager.cs b/OpenSim/Data/SQLite/SQLiteManager.cs
index a936ec1..4d45d08 100644
--- a/OpenSim/Data/SQLite/SQLiteManager.cs
+++ b/OpenSim/Data/SQLite/SQLiteManager.cs
@@ -30,8 +30,8 @@ using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Data.SQLite; 31using System.Data.SQLite;
32using System.Reflection; 32using System.Reflection;
33using OpenMetaverse;
34using log4net; 33using log4net;
34using OpenMetaverse;
35 35
36namespace OpenSim.Data.SQLite 36namespace OpenSim.Data.SQLite
37{ 37{
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 89308db..7ec4ceb 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -28,13 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Drawing;
31using System.IO; 32using System.IO;
32using System.Reflection; 33using System.Reflection;
33using System.Threading;
34using System.Drawing;
35using OpenMetaverse;
36using log4net; 34using log4net;
37using Mono.Data.SqliteClient; 35using Mono.Data.SqliteClient;
36using OpenMetaverse;
38using OpenSim.Framework; 37using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 1c36453..788a9ea 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using Mono.Data.SqliteClient; 33using Mono.Data.SqliteClient;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36 36
37namespace OpenSim.Data.SQLite 37namespace OpenSim.Data.SQLite
@@ -645,7 +645,7 @@ namespace OpenSim.Data.SQLite
645 try { 645 try {
646 aa = aplist[user]; 646 aa = aplist[user];
647 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString()); 647 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
648 } catch (System.Collections.Generic.KeyNotFoundException) { 648 } catch (KeyNotFoundException) {
649 m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString()); 649 m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
650 } 650 }
651 return aa; 651 return aa;
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
index 0de965d..60aa1f3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
@@ -25,16 +25,9 @@
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.IO; 28using 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.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
index 31efcc3..774cca1 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
@@ -25,16 +25,9 @@
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.IO; 28using 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.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
index 07b0dab..70903c3 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
@@ -25,17 +25,9 @@
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.IO; 28using 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.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38using log4net;
39 31
40namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
41{ 33{
@@ -61,7 +53,7 @@ namespace OpenSim.Data.SQLite.Tests
61 public void Cleanup() 53 public void Cleanup()
62 { 54 {
63 db.Dispose(); 55 db.Dispose();
64 System.IO.File.Delete(file); 56 File.Delete(file);
65 } 57 }
66 } 58 }
67} 59}
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
index 86a1192..652a53a 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
@@ -25,16 +25,9 @@
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.IO; 28using 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.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
index 0415219..6f8d89d 100644
--- a/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
+++ b/OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
@@ -25,16 +25,9 @@
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.IO; 28using 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.SQLite;
36using OpenSim.Region.Framework.Scenes;
37using OpenMetaverse;
38 31
39namespace OpenSim.Data.SQLite.Tests 32namespace OpenSim.Data.SQLite.Tests
40{ 33{
@@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
58 public void Cleanup() 51 public void Cleanup()
59 { 52 {
60 db.Dispose(); 53 db.Dispose();
61 System.IO.File.Delete(file); 54 File.Delete(file);
62 } 55 }
63 } 56 }
64} \ No newline at end of file 57} \ No newline at end of file
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 10cd35f..4d2bbc7 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -26,13 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using NUnit.Framework; 30using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenSim.Data;
33using OpenSim.Framework;
34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
36 34
37namespace OpenSim.Data.Tests 35namespace OpenSim.Data.Tests
38{ 36{
@@ -48,7 +46,7 @@ namespace OpenSim.Data.Tests
48 { 46 {
49 try 47 try
50 { 48 {
51 log4net.Config.XmlConfigurator.Configure(); 49 XmlConfigurator.Configure();
52 } 50 }
53 catch (Exception) 51 catch (Exception)
54 { 52 {
diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs
index 325014b..24c25ec 100644
--- a/OpenSim/Data/Tests/BasicEstateTest.cs
+++ b/OpenSim/Data/Tests/BasicEstateTest.cs
@@ -26,14 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using System.Drawing;
31using System.Text;
32using NUnit.Framework; 30using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
34using OpenSim.Framework;
35using OpenSim.Data;
36using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
37using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
38 35
39namespace OpenSim.Data.Tests 36namespace OpenSim.Data.Tests
@@ -49,7 +46,7 @@ namespace OpenSim.Data.Tests
49 { 46 {
50 try 47 try
51 { 48 {
52 log4net.Config.XmlConfigurator.Configure(); 49 XmlConfigurator.Configure();
53 } 50 }
54 catch (Exception) 51 catch (Exception)
55 { 52 {
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index adf3879..e3256ff 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -28,11 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using log4net.Config;
31using NUnit.Framework; 32using NUnit.Framework;
32using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
33using OpenSim.Data;
34using OpenSim.Framework;
35using OpenSim.Region.Framework.Scenes;
36using OpenMetaverse; 34using OpenMetaverse;
37 35
38namespace OpenSim.Data.Tests 36namespace OpenSim.Data.Tests
@@ -49,7 +47,7 @@ namespace OpenSim.Data.Tests
49 { 47 {
50 try 48 try
51 { 49 {
52 log4net.Config.XmlConfigurator.Configure(); 50 XmlConfigurator.Configure();
53 } 51 }
54 catch (Exception) 52 catch (Exception)
55 { 53 {
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index 1e13ec4..1b8a5de 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -26,13 +26,11 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using NUnit.Framework; 30using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 31using NUnit.Framework.SyntaxHelpers;
32using OpenSim.Framework;
33using OpenSim.Data;
34using OpenSim.Region.Framework.Scenes;
35using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
36 34
37namespace OpenSim.Data.Tests 35namespace OpenSim.Data.Tests
38{ 36{
@@ -67,7 +65,7 @@ namespace OpenSim.Data.Tests
67 { 65 {
68 try 66 try
69 { 67 {
70 log4net.Config.XmlConfigurator.Configure(); 68 XmlConfigurator.Configure();
71 } 69 }
72 catch (Exception) 70 catch (Exception)
73 { 71 {
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index d60dadd..8e58443 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -29,14 +29,13 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Text; 31using System.Text;
32using log4net.Config;
32using NUnit.Framework; 33using NUnit.Framework;
33using NUnit.Framework.SyntaxHelpers; 34using NUnit.Framework.SyntaxHelpers;
35using OpenMetaverse;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Data;
36using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.CoreModules.World.Land;
39using OpenMetaverse;
40 39
41namespace OpenSim.Data.Tests 40namespace OpenSim.Data.Tests
42{ 41{
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
71 { 70 {
72 try 71 try
73 { 72 {
74 log4net.Config.XmlConfigurator.Configure(); 73 XmlConfigurator.Configure();
75 } 74 }
76 catch (Exception) 75 catch (Exception)
77 { 76 {
@@ -140,7 +139,7 @@ namespace OpenSim.Data.Tests
140 } 139 }
141 catch (Exception e) 140 catch (Exception e)
142 { 141 {
143 System.Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e); 142 Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
144 Assert.Fail(); 143 Assert.Fail();
145 } 144 }
146 145
@@ -150,7 +149,7 @@ namespace OpenSim.Data.Tests
150 } 149 }
151 catch (Exception e) 150 catch (Exception e)
152 { 151 {
153 System.Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e); 152 Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
154 Assert.Fail(); 153 Assert.Fail();
155 } 154 }
156 155
@@ -651,7 +650,7 @@ namespace OpenSim.Data.Tests
651 } 650 }
652 651
653 [Test] 652 [Test]
654 [ExpectedException(typeof(System.ArgumentException))] 653 [ExpectedException(typeof(ArgumentException))]
655 public void T026_PrimInventoryMany() 654 public void T026_PrimInventoryMany()
656 { 655 {
657 UUID i1,i2,i3,i4; 656 UUID i1,i2,i3,i4;
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index 5464ade..f0a90a9 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -30,12 +30,11 @@
30using System; 30using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Text; 32using System.Text;
33using log4net.Config;
33using NUnit.Framework; 34using NUnit.Framework;
34using NUnit.Framework.SyntaxHelpers; 35using NUnit.Framework.SyntaxHelpers;
35using OpenSim.Data;
36using OpenSim.Framework;
37using OpenSim.Region.Framework.Scenes;
38using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework;
39 38
40namespace OpenSim.Data.Tests 39namespace OpenSim.Data.Tests
41{ 40{
@@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
71 { 70 {
72 try 71 try
73 { 72 {
74 log4net.Config.XmlConfigurator.Configure(); 73 XmlConfigurator.Configure();
75 } 74 }
76 catch (Exception) 75 catch (Exception)
77 { 76 {
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index eaad7ae..0fa9e58 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -25,10 +25,8 @@
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.Reflection;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using OpenMetaverse; 29using OpenMetaverse;
31using log4net;
32using OpenSim.Framework; 30using OpenSim.Framework;
33 31
34namespace OpenSim.Data 32namespace OpenSim.Data