aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Data/MySQL
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/MySQL')
-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
14 files changed, 31 insertions, 77 deletions
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 }