* optimized usings.

0.6.3-post-fixes
lbsa71 2009-02-12 09:53:12 +00:00
parent d21601d497
commit 801da4346a
383 changed files with 1318 additions and 2154 deletions

View File

@ -25,20 +25,19 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using log4net;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.RegionLoader.Filesystem;
using OpenSim.Framework.RegionLoader.Web;
using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
using OpenSim.Region.CoreModules.Agent.AssetTransaction;
using OpenSim.Region.CoreModules.Avatar.InstantMessage;
using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
using OpenSim.Region.CoreModules.Scripting.XMLRPC;
using OpenSim.Region.CoreModules.Agent.AssetTransaction;
namespace OpenSim.ApplicationPlugins.LoadRegions
{
@ -88,7 +87,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
if (!CheckRegionsForSanity(regionsToLoad))
{
m_log.Error("[LOADREGIONS]: Halting startup due to conflicts in region configurations");
System.Environment.Exit(1);
Environment.Exit(1);
}
for (int i = 0; i < regionsToLoad.Length; i++)

View File

@ -27,20 +27,20 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
using System.Timers;
using OpenMetaverse;
using log4net;
using Nini.Config;
using Nwc.XmlRpc;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Region.CoreModules.World.Terrain;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.CoreModules.World.Terrain;
using System.Collections.Generic;
namespace OpenSim.ApplicationPlugins.RemoteController
{

View File

@ -25,8 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
/// <summary>

View File

@ -25,7 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using OpenSim.Framework.Servers;
namespace OpenSim.ApplicationPlugins.Rest.Inventory

View File

@ -26,17 +26,14 @@
*/
using System;
using System.IO;
using System.Reflection;
using System.Text;
using System.Security.Cryptography;
using System.Text.RegularExpressions;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenMetaverse;
using System.Xml;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{

View File

@ -30,18 +30,17 @@ using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using log4net;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
public class Rest
{
internal static readonly log4net.ILog Log =
log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
internal static readonly ILog Log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
internal static bool DEBUG = Log.IsDebugEnabled;
@ -468,25 +467,25 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
public static void Dump(byte[] data)
{
char[] buffer = new char[Rest.DumpLineSize];
char[] buffer = new char[DumpLineSize];
int cc = 0;
for (int i = 0; i < data.Length; i++)
{
if (i % Rest.DumpLineSize == 0) Console.Write("\n{0}: ",i.ToString("d8"));
if (i % DumpLineSize == 0) Console.Write("\n{0}: ",i.ToString("d8"));
if (i % 4 == 0) Console.Write(" ");
Console.Write("{0}",data[i].ToString("x2"));
if (data[i] < 127 && data[i] > 31)
buffer[i % Rest.DumpLineSize] = (char) data[i];
buffer[i % DumpLineSize] = (char) data[i];
else
buffer[i % Rest.DumpLineSize] = '.';
buffer[i % DumpLineSize] = '.';
cc++;
if (i != 0 && (i + 1) % Rest.DumpLineSize == 0)
if (i != 0 && (i + 1) % DumpLineSize == 0)
{
Console.Write(" |"+(new String(buffer))+"|");
cc = 0;
@ -497,11 +496,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (cc != 0)
{
for (int i = cc ; i < Rest.DumpLineSize; i++)
for (int i = cc ; i < DumpLineSize; i++)
{
if (i % 4 == 0) Console.Write(" ");
Console.Write(" ");
buffer[i % Rest.DumpLineSize] = ' ';
buffer[i % DumpLineSize] = ' ';
}
Console.WriteLine(" |"+(new String(buffer))+"|");
}

View File

@ -27,18 +27,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Xml;
using System.Drawing;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenMetaverse;
using OpenMetaverse.Imaging;
using Nini.Config;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{

View File

@ -25,17 +25,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenMetaverse;
using Nini.Config;
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Xml;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{

View File

@ -28,9 +28,7 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{

View File

@ -27,18 +27,18 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Threading;
using System.Xml;
using System.Drawing;
using System.Timers;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using System.Xml;
using OpenMetaverse;
using OpenMetaverse.Imaging;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers;
using Timer=System.Timers.Timer;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{
@ -1931,19 +1931,19 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
switch (ic.xml.Name)
{
case "current":
ic.CurrentPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
ic.CurrentPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
break;
case "next":
ic.NextPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
ic.NextPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
break;
case "group":
ic.GroupPermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
ic.GroupPermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
break;
case "everyone":
ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
ic.EveryOnePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
break;
case "base":
ic.BasePermissions = UInt32.Parse(ic.xml.Value, System.Globalization.NumberStyles.HexNumber);
ic.BasePermissions = UInt32.Parse(ic.xml.Value, NumberStyles.HexNumber);
break;
default:
Rest.Log.DebugFormat("{0} Permissions: invalid attribute {1}:{2}",
@ -2176,7 +2176,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
internal UserProfileData userProfile = null;
internal InventoryFolderBase root = null;
internal bool timeout = false;
internal System.Timers.Timer watchDog = new System.Timers.Timer();
internal Timer watchDog = new Timer();
internal InventoryRequestData(OSHttpRequest request, OSHttpResponse response, string prefix)
: base(request, response, prefix)

View File

@ -26,17 +26,10 @@
*
*/
using OpenMetaverse;
using Nini.Config;
using System;
using System.IO;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{

View File

@ -26,8 +26,6 @@
*
*/
using System;
namespace OpenSim.ApplicationPlugins.Rest.Inventory
{

View File

@ -25,18 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenMetaverse;
using Nini.Config;
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Xml;
using OpenSim.Framework;
using OpenMetaverse;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests
{

View File

@ -26,27 +26,12 @@
*/
using System;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Timers;
using System.Xml;
using System.Xml.Serialization;
using OpenMetaverse;
using Mono.Addins;
using Nwc.XmlRpc;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Regions
{

View File

@ -26,27 +26,11 @@
*/
using System;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Timers;
using System.Xml;
using System.Xml.Serialization;
using OpenMetaverse;
using Mono.Addins;
using Nwc.XmlRpc;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Regions
{

View File

@ -25,13 +25,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenMetaverse;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Xml.Serialization;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.ApplicationPlugins.Rest.Regions
{

View File

@ -26,25 +26,7 @@
*/
using System;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Timers;
using System.Xml;
using System.Xml.Serialization;
using OpenMetaverse;
using Nwc.XmlRpc;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Region.Framework.Scenes;
using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Regions
{

View File

@ -26,22 +26,15 @@
*/
using System;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Reflection;
using System.Timers;
using System.Xml;
using OpenMetaverse;
using Nwc.XmlRpc;
using log4net;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.ApplicationPlugins.Rest
{
@ -49,8 +42,8 @@ namespace OpenSim.ApplicationPlugins.Rest
{
#region properties
protected static readonly log4net.ILog m_log =
log4net.LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IConfig _config; // Configuration source: Rest Plugins
private IConfig _pluginConfig; // Configuration source: Plugin specific
@ -65,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.Rest
private string _godkey;
private int _reqk;
[ThreadStaticAttribute]
[ThreadStatic]
private static string _threadRequestID = String.Empty;
/// <summary>

View File

@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
@ -10,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("OpenSim.ApplicationPlugins.ScriptEngine")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@ -25,9 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Reflection;
using System.Text;
using log4net;
using Nini.Config;
using OpenSim.Region.Framework.Interfaces;

View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@ -24,8 +24,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Reflection;
using log4net;

View File

@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Data.SqlClient;
using System.Data;
using System.Data.SqlClient;
namespace OpenSim.Data.MSSQL
{

View File

@ -28,8 +28,8 @@
using System;
using System.Data;
using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MSSQL
@ -71,7 +71,7 @@ namespace OpenSim.Data.MSSQL
/// <param name="connectionString">connect string</param>
override public void Initialise(string connectionString)
{
TicksToEpoch = new System.DateTime(1970, 1, 1).Ticks;
TicksToEpoch = new DateTime(1970, 1, 1).Ticks;
if (!string.IsNullOrEmpty(connectionString))
{
@ -162,7 +162,7 @@ namespace OpenSim.Data.MSSQL
" VALUES " +
"(@id, @name, @description, @assetType, @local, @temporary, @create_time, @access_time, @data)"))
{
int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
command.Parameters.Add(database.CreateParameter("id", asset.Metadata.FullID));
command.Parameters.Add(database.CreateParameter("name", asset.Metadata.Name));
command.Parameters.Add(database.CreateParameter("description", asset.Metadata.Description));

View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@ -30,8 +30,8 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;

View File

@ -30,8 +30,8 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MSSQL

View File

@ -30,8 +30,8 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MSSQL

View File

@ -31,8 +31,8 @@ using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
namespace OpenSim.Data.MSSQL
{
@ -219,7 +219,7 @@ namespace OpenSim.Data.MSSQL
{
return value.ToString();
}
if (valueType == typeof(OpenMetaverse.UUID))
if (valueType == typeof(UUID))
{
return value.ToString();
}

View File

@ -26,11 +26,9 @@
*/
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Reflection;
using System.Text;
namespace OpenSim.Data.MSSQL
{

View File

@ -32,8 +32,8 @@ using System.Data.SqlClient;
using System.Drawing;
using System.IO;
using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

View File

@ -31,8 +31,8 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MSSQL

View File

@ -70,7 +70,7 @@ namespace OpenSim.Data
public class Migration
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private string _type;
private DbConnection _conn;

View File

@ -26,15 +26,13 @@
*/
using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL
{
/// <summary>
@ -62,7 +60,7 @@ namespace OpenSim.Data.MySQL
/// <param name="connect">connect string</param>
override public void Initialise(string connect)
{
TicksToEpoch = new System.DateTime(1970,1,1).Ticks;
TicksToEpoch = new DateTime(1970,1,1).Ticks;
// TODO: This will let you pass in the connect string in
// the config, though someone will need to write that.
@ -145,7 +143,7 @@ namespace OpenSim.Data.MySQL
{
asset.Metadata.Local = (bool)dbReader["local"];
}
catch (System.InvalidCastException)
catch (InvalidCastException)
{
asset.Metadata.Local = false;
}
@ -199,7 +197,7 @@ namespace OpenSim.Data.MySQL
using (cmd)
{
// create unix epoch time
int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
cmd.Parameters.AddWithValue("?name", asset.Metadata.Name);
cmd.Parameters.AddWithValue("?description", asset.Metadata.Description);
@ -240,7 +238,7 @@ namespace OpenSim.Data.MySQL
using (cmd)
{
// create unix epoch time
int now = (int)((System.DateTime.Now.Ticks - TicksToEpoch) / 10000000);
int now = (int)((DateTime.Now.Ticks - TicksToEpoch) / 10000000);
cmd.Parameters.AddWithValue("?id", asset.Metadata.ID);
cmd.Parameters.AddWithValue("?access_time", now);
cmd.ExecuteNonQuery();

View File

@ -28,15 +28,12 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Reflection;
using System.Threading;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.MySQL
{
@ -131,7 +128,7 @@ namespace OpenSim.Data.MySQL
cmd.Dispose();
}
m_lastConnectionUse = System.DateTime.Now.Ticks;
m_lastConnectionUse = DateTime.Now.Ticks;
m_log.DebugFormat(
"[REGION DB]: Connection wait timeout {0} seconds",
@ -140,7 +137,7 @@ namespace OpenSim.Data.MySQL
protected void CheckConnection()
{
long timeNow = System.DateTime.Now.Ticks;
long timeNow = DateTime.Now.Ticks;
if (timeNow - m_lastConnectionUse > m_waitTimeout ||
m_connection.State != ConnectionState.Open)
{
@ -185,7 +182,7 @@ namespace OpenSim.Data.MySQL
else
m_FieldMap[name].SetValue(es, false);
}
else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
else if (m_FieldMap[name].GetValue(es) is UUID)
{
UUID uuid = UUID.Zero;

View File

@ -29,8 +29,9 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using OpenMetaverse;
using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL
@ -78,7 +79,7 @@ namespace OpenSim.Data.MySQL
if (lockedCons > m_maxConnections)
{
lockedCons = 0;
System.Threading.Thread.Sleep(1000); // Wait some time before searching them again.
Thread.Sleep(1000); // Wait some time before searching them again.
m_log.Debug(
"WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
}

View File

@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Reflection;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL

View File

@ -25,8 +25,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Reflection;
using System.Collections.Generic;
using System.Reflection;
using log4net;
using OpenSim.Framework;

View File

@ -26,14 +26,14 @@
*/
using System;
using System.Collections.Generic;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Reflection;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL
@ -148,7 +148,7 @@ namespace OpenSim.Data.MySQL
cmd.Dispose();
}
m_lastConnectionUse = System.DateTime.Now.Ticks;
m_lastConnectionUse = DateTime.Now.Ticks;
m_log.DebugFormat(
"[REGION DB]: Connection wait timeout {0} seconds", m_waitTimeout / TimeSpan.TicksPerSecond);
@ -161,7 +161,7 @@ namespace OpenSim.Data.MySQL
{
//m_log.Debug("[REGION DB]: Checking connection");
long timeNow = System.DateTime.Now.Ticks;
long timeNow = DateTime.Now.Ticks;
if (timeNow - m_lastConnectionUse > m_waitTimeout || dbcon.State != ConnectionState.Open)
{
m_log.DebugFormat("[REGION DB]: Database connection has gone away - reconnecting");

View File

@ -28,13 +28,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Threading;
using System.Drawing;
using OpenMetaverse;
using log4net;
using MySql.Data.MySqlClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
@ -89,7 +89,7 @@ namespace OpenSim.Data.MySQL
}
catch (Exception)
{
System.Threading.Thread.Sleep(500);
Thread.Sleep(500);
m_Connection.Close();
m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();
@ -122,7 +122,7 @@ namespace OpenSim.Data.MySQL
}
catch (Exception)
{
System.Threading.Thread.Sleep(500);
Thread.Sleep(500);
m_Connection.Close();
m_Connection = (MySqlConnection) ((ICloneable)m_Connection).Clone();

View File

@ -31,8 +31,9 @@ using System.Collections.Generic;
using System.Data;
using System.Reflection;
using System.Text.RegularExpressions;
using OpenMetaverse;
using System.Threading;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.MySQL
@ -93,7 +94,7 @@ namespace OpenSim.Data.MySQL
if (lockedCons > m_maxConnections)
{
lockedCons = 0;
System.Threading.Thread.Sleep(1000); // Wait some time before searching them again.
Thread.Sleep(1000); // Wait some time before searching them again.
m_log.Debug(
"WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
m_log.Debug("Current connections-in-use dump:");

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@ -63,7 +56,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,16 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using log4net;
namespace OpenSim.Data.MySQL.Tests
{
@ -62,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.MySQL;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.MySQL.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.MySQL.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -27,12 +27,10 @@
using System;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using System.Drawing;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;
using System.Drawing;
namespace OpenSim.Data.NHibernate
{

View File

@ -27,10 +27,10 @@
using System;
using System.Data;
using OpenMetaverse;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate
{

View File

@ -27,10 +27,10 @@
using System;
using System.Data;
using OpenMetaverse;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate
{

View File

@ -27,10 +27,10 @@
using System;
using System.Data;
using OpenMetaverse;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate
{

View File

@ -25,16 +25,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections;
using System.IO;
using System.Reflection;
using System.Text.RegularExpressions;
using OpenMetaverse;
using log4net;
using NHibernate;
using OpenMetaverse;
using OpenSim.Framework;
using Environment=NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate
{

View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@ -27,15 +27,14 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using log4net;
using System.Reflection;
using OpenSim.Framework;
using log4net;
using NHibernate;
using NHibernate.Criterion;
using System.Collections;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.NHibernate
{
@ -93,7 +92,7 @@ namespace OpenSim.Data.NHibernate
}
}
public override bool AuthenticateSim(OpenMetaverse.UUID UUID, ulong regionHandle, string simrecvkey)
public override bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey)
{
bool throwHissyFit = false; // Should be true by 1.0
@ -147,7 +146,7 @@ namespace OpenSim.Data.NHibernate
return DataResponse.RESPONSE_ERROR;
}
public override RegionProfileData GetProfileByUUID(OpenMetaverse.UUID UUID)
public override RegionProfileData GetProfileByUUID(UUID UUID)
{
return (RegionProfileData)manager.Load(typeof(RegionProfileData), UUID);
}

View File

@ -27,15 +27,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Text.RegularExpressions;
using OpenMetaverse;
using log4net;
using NHibernate;
using NHibernate.Criterion;
using OpenMetaverse;
using OpenSim.Framework;
using Environment=NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate
{

View File

@ -26,8 +26,8 @@
*/
using System;
using System.Data.Common;
using System.Reflection;
using System.IO;
using log4net;
using NHibernate;
using NHibernate.Cfg;
@ -92,7 +92,7 @@ namespace OpenSim.Data.NHibernate
migrationSubType = "MySQLDialect";
}
Migration migration = new Migration((System.Data.Common.DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
Migration migration = new Migration((DbConnection)sessionFactory.ConnectionProvider.GetConnection(), assembly, migrationSubType, store);
migration.Update();
}

View File

@ -26,19 +26,15 @@
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Text.RegularExpressions;
using OpenMetaverse;
using log4net;
using NHibernate;
using NHibernate.Criterion;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using Environment = NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate
{

View File

@ -25,17 +25,13 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Text.RegularExpressions;
using OpenMetaverse;
using log4net;
using NHibernate;
using NHibernate.Criterion;
using OpenMetaverse;
using OpenSim.Framework;
using Environment=NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate
{

View File

@ -27,8 +27,6 @@
using System;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;

View File

@ -28,9 +28,9 @@
using System;
using System.IO;
using System.Reflection;
using OpenSim.Framework;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.NHibernate
{

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using OpenSim.Data.NHibernate;
namespace OpenSim.Data.NHibernate.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,16 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using log4net;
namespace OpenSim.Data.NHibernate.Tests
{
@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using OpenSim.Data.NHibernate;
namespace OpenSim.Data.NHibernate.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,16 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using log4net;
namespace OpenSim.Data.NHibernate.Tests
{
@ -62,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -62,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,14 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,14 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenMetaverse;
using OpenSim.Data.NHibernate;
namespace OpenSim.Data.NHibernate.Tests
{
@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,15 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenMetaverse;
using log4net;
namespace OpenSim.Data.NHibernate.Tests
{
@ -61,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,14 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -26,14 +26,8 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -60,7 +54,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -27,14 +27,8 @@
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -27,14 +27,8 @@
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using OpenSim.Data.NHibernate;
namespace OpenSim.Data.NHibernate.Tests
{
@ -61,7 +55,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -27,15 +27,8 @@
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using log4net;
namespace OpenSim.Data.NHibernate.Tests
{
@ -63,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -27,14 +27,8 @@
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -27,14 +27,8 @@
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.NHibernate;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate.Tests
{
@ -62,7 +56,7 @@ namespace OpenSim.Data.NHibernate.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception {0}", e);
Console.WriteLine("Exception {0}", e);
Assert.Ignore();
}
}

View File

@ -27,11 +27,11 @@
using System;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.NHibernate
{

View File

@ -27,8 +27,6 @@
using System;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;

View File

@ -27,8 +27,6 @@
using System;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;

View File

@ -27,8 +27,6 @@
using System;
using System.Data;
using OpenMetaverse;
using OpenSim.Framework;
using NHibernate;
using NHibernate.SqlTypes;
using NHibernate.UserTypes;

View File

@ -25,9 +25,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections.Generic;
using System.Text;
using OpenMetaverse;
namespace OpenSim.Data.NHibernate

View File

@ -27,8 +27,8 @@
using System;
using System.Collections;
using OpenMetaverse;
using Nwc.XmlRpc;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data

View File

@ -28,9 +28,9 @@
using System;
using System.Data;
using System.Reflection;
using OpenMetaverse;
using log4net;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.SQLite

View File

@ -28,15 +28,12 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Reflection;
using System.Threading;
using OpenMetaverse;
using Mono.Data.SqliteClient;
using log4net;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Data.SQLite
{
@ -109,7 +106,7 @@ namespace OpenSim.Data.SQLite
else
m_FieldMap[name].SetValue(es, false);
}
else if (m_FieldMap[name].GetValue(es) is OpenMetaverse.UUID)
else if (m_FieldMap[name].GetValue(es) is UUID)
{
UUID uuid = UUID.Zero;

View File

@ -29,10 +29,8 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.SQLite

View File

@ -29,9 +29,9 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using OpenMetaverse;
using log4net;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.SQLite

View File

@ -30,8 +30,8 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SQLite;
using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenMetaverse;
namespace OpenSim.Data.SQLite
{

View File

@ -28,13 +28,12 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Threading;
using System.Drawing;
using OpenMetaverse;
using log4net;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

View File

@ -29,9 +29,9 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Reflection;
using OpenMetaverse;
using log4net;
using Mono.Data.SqliteClient;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.SQLite
@ -645,7 +645,7 @@ namespace OpenSim.Data.SQLite
try {
aa = aplist[user];
m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
} catch (System.Collections.Generic.KeyNotFoundException) {
} catch (KeyNotFoundException) {
m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
}
return aa;

View File

@ -25,16 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.SQLite;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.SQLite.Tests
{
@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
public void Cleanup()
{
db.Dispose();
System.IO.File.Delete(file);
File.Delete(file);
}
}
}

View File

@ -25,16 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.SQLite;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.SQLite.Tests
{

View File

@ -25,17 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.SQLite;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using log4net;
namespace OpenSim.Data.SQLite.Tests
{
@ -61,7 +53,7 @@ namespace OpenSim.Data.SQLite.Tests
public void Cleanup()
{
db.Dispose();
System.IO.File.Delete(file);
File.Delete(file);
}
}
}

View File

@ -25,16 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.SQLite;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.SQLite.Tests
{
@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
public void Cleanup()
{
db.Dispose();
System.IO.File.Delete(file);
File.Delete(file);
}
}
}

View File

@ -25,16 +25,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.IO;
using System.Collections.Generic;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data.Tests;
using OpenSim.Data.SQLite;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.SQLite.Tests
{
@ -58,7 +51,7 @@ namespace OpenSim.Data.SQLite.Tests
public void Cleanup()
{
db.Dispose();
System.IO.File.Delete(file);
File.Delete(file);
}
}
}

View File

@ -26,13 +26,11 @@
*/
using System;
using System.Collections.Generic;
using log4net.Config;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Data;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.Tests
{
@ -48,7 +46,7 @@ namespace OpenSim.Data.Tests
{
try
{
log4net.Config.XmlConfigurator.Configure();
XmlConfigurator.Configure();
}
catch (Exception)
{

View File

@ -26,14 +26,11 @@
*/
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Text;
using log4net.Config;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Data.Tests
@ -49,7 +46,7 @@ namespace OpenSim.Data.Tests
{
try
{
log4net.Config.XmlConfigurator.Configure();
XmlConfigurator.Configure();
}
catch (Exception)
{

View File

@ -28,11 +28,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using log4net.Config;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Data;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
namespace OpenSim.Data.Tests
@ -49,7 +47,7 @@ namespace OpenSim.Data.Tests
{
try
{
log4net.Config.XmlConfigurator.Configure();
XmlConfigurator.Configure();
}
catch (Exception)
{

View File

@ -26,13 +26,11 @@
*/
using System;
using System.Collections.Generic;
using log4net.Config;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework;
using OpenSim.Data;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Data.Tests
{
@ -67,7 +65,7 @@ namespace OpenSim.Data.Tests
{
try
{
log4net.Config.XmlConfigurator.Configure();
XmlConfigurator.Configure();
}
catch (Exception)
{

View File

@ -29,14 +29,13 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Text;
using log4net.Config;
using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Data;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.CoreModules.World.Land;
using OpenMetaverse;
namespace OpenSim.Data.Tests
{
@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
{
try
{
log4net.Config.XmlConfigurator.Configure();
XmlConfigurator.Configure();
}
catch (Exception)
{
@ -140,7 +139,7 @@ namespace OpenSim.Data.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
Console.WriteLine("Exception in storing object {0} {1}", sog.ToString(), e);
Assert.Fail();
}
@ -150,7 +149,7 @@ namespace OpenSim.Data.Tests
}
catch (Exception e)
{
System.Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
Console.WriteLine("Exception in storing object {0} {1}", sog2.ToString(), e);
Assert.Fail();
}
@ -651,7 +650,7 @@ namespace OpenSim.Data.Tests
}
[Test]
[ExpectedException(typeof(System.ArgumentException))]
[ExpectedException(typeof(ArgumentException))]
public void T026_PrimInventoryMany()
{
UUID i1,i2,i3,i4;

Some files were not shown because too many files have changed in this diff Show More