OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

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

6
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

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

2
OpenSim/ApplicationPlugins/Rest/Inventory/IRest.cs
View File

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

1
OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
View File

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

13
OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
View File

@ -26,17 +26,14 @@
*/ */
using System; 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.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;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenMetaverse;
using System.Xml;
namespace OpenSim.ApplicationPlugins.Rest.Inventory namespace OpenSim.ApplicationPlugins.Rest.Inventory
{ {

25
OpenSim/ApplicationPlugins/Rest/Inventory/Rest.cs
View File

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

10
OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
View File

@ -27,18 +27,10 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Xml; using System.Xml;
using System.Drawing; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; 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 namespace OpenSim.ApplicationPlugins.Rest.Inventory
{ {

8
OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
View File

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

2
OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
View File

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

26
OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
View File

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

7
OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
View File

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

2
OpenSim/ApplicationPlugins/Rest/Inventory/tests/ITest.cs
View File

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

11
OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs
View File

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

15
OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
View File

@ -26,27 +26,12 @@
*/ */
using System; using System;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net;
using System.Reflection;
using System.Text.RegularExpressions;
using System.Timers;
using System.Xml;
using System.Xml.Serialization; using System.Xml.Serialization;
using OpenMetaverse; 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.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Regions namespace OpenSim.ApplicationPlugins.Rest.Regions
{ {

16
OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
View File

@ -26,27 +26,11 @@
*/ */
using System; using System;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
using System.IO; 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 OpenMetaverse;
using Mono.Addins;
using Nwc.XmlRpc;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Communications;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.ApplicationPlugins.Rest;
namespace OpenSim.ApplicationPlugins.Rest.Regions namespace OpenSim.ApplicationPlugins.Rest.Regions
{ {

5
OpenSim/ApplicationPlugins/Rest/Regions/RegionDetails.cs
View File

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

18
OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
View File

@ -26,25 +26,7 @@
*/ */
using System; 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 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 namespace OpenSim.ApplicationPlugins.Rest.Regions
{ {

17
OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
View File

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

5
OpenSim/ApplicationPlugins/ScriptEngine/Properties/AssemblyInfo.cs
View File

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

4
OpenSim/ApplicationPlugins/ScriptEngine/RegionEngineLoader.cs
View File

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

4
OpenSim/ApplicationPlugins/ScriptEngine/ScriptEnginePlugin.cs
View File

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

2
OpenSim/Data/MSSQL/AutoClosingSqlCommand.cs
View File

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

6
OpenSim/Data/MSSQL/MSSQLAssetData.cs
View File

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

4
OpenSim/Data/MSSQL/MSSQLEstateData.cs
View File

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

2
OpenSim/Data/MSSQL/MSSQLGridData.cs
View File

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

2
OpenSim/Data/MSSQL/MSSQLInventoryData.cs
View File

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

4
OpenSim/Data/MSSQL/MSSQLManager.cs
View File

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

2
OpenSim/Data/MSSQL/MSSQLMigration.cs
View File

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

2
OpenSim/Data/MSSQL/MSSQLRegionData.cs
View File

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

2
OpenSim/Data/MSSQL/MSSQLUserData.cs
View File

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

2
OpenSim/Data/Migration.cs
View File

@ -70,7 +70,7 @@ namespace OpenSim.Data
public class Migration 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 string _type;
private DbConnection _conn; private DbConnection _conn;

12
OpenSim/Data/MySQL/MySQLAssetData.cs
View File

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

11
OpenSim/Data/MySQL/MySQLEstateData.cs
View File

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

5
OpenSim/Data/MySQL/MySQLGridData.cs
View File

@ -29,8 +29,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Reflection; using System.Reflection;
using OpenMetaverse; using System.Threading;
using log4net; using log4net;
using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
namespace OpenSim.Data.MySQL namespace OpenSim.Data.MySQL
@ -78,7 +79,7 @@ namespace OpenSim.Data.MySQL
if (lockedCons > m_maxConnections) if (lockedCons > m_maxConnections)
{ {
lockedCons = 0; 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( m_log.Debug(
"WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound."); "WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound.");
} }

2
OpenSim/Data/MySQL/MySQLInventoryData.cs
View File

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

2
OpenSim/Data/MySQL/MySQLLogData.cs
View File

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

8
OpenSim/Data/MySQL/MySQLManager.cs
View File

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

8
OpenSim/Data/MySQL/MySQLRegionData.cs
View File

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

5
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@ -31,8 +31,9 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Reflection; using System.Reflection;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using OpenMetaverse; using System.Threading;
using log4net; using log4net;
using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
namespace OpenSim.Data.MySQL namespace OpenSim.Data.MySQL
@ -93,7 +94,7 @@ namespace OpenSim.Data.MySQL
if (lockedCons > m_maxConnections) if (lockedCons > m_maxConnections)
{ {
lockedCons = 0; 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( m_log.Debug(
"WARNING: All threads are in use. Probable cause: Something didnt release a mutex properly, or high volume of requests inbound."); "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:"); m_log.Debug("Current connections-in-use dump:");

9
OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs
View File

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

9
OpenSim/Data/MySQL/Tests/MySQLEstateTest.cs
View File

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

9
OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
View File

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

10
OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
View File

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

9
OpenSim/Data/MySQL/Tests/MySQLRegionTest.cs
View File

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

9
OpenSim/Data/MySQL/Tests/MySQLUserTest.cs
View File

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

4
OpenSim/Data/NHibernate/ColorUserType.cs
View File

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

2
OpenSim/Data/NHibernate/LLQuaternionUserType.cs
View File

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

2
OpenSim/Data/NHibernate/LLUUIDUserType.cs
View File

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

2
OpenSim/Data/NHibernate/LLVector3UserType.cs
View File

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

8
OpenSim/Data/NHibernate/NHibernateAssetData.cs
View File

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

13
OpenSim/Data/NHibernate/NHibernateGridData.cs
View File

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

5
OpenSim/Data/NHibernate/NHibernateInventoryData.cs
View File

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

6
OpenSim/Data/NHibernate/NHibernateManager.cs
View File

@ -26,14 +26,14 @@
*/ */
using System; using System;
using System.Data.Common;
using System.Reflection; using System.Reflection;
using System.IO;
using log4net; using log4net;
using NHibernate; using NHibernate;
using NHibernate.Cfg; using NHibernate.Cfg;
using NHibernate.Tool.hbm2ddl; using NHibernate.Tool.hbm2ddl;
using OpenMetaverse; using OpenMetaverse;
using Environment = NHibernate.Cfg.Environment; using Environment=NHibernate.Cfg.Environment;
namespace OpenSim.Data.NHibernate namespace OpenSim.Data.NHibernate
{ {
@ -92,7 +92,7 @@ namespace OpenSim.Data.NHibernate
migrationSubType = "MySQLDialect"; 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(); migration.Update();
} }

6
OpenSim/Data/NHibernate/NHibernateRegionData.cs
View File

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

6
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

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

2
OpenSim/Data/NHibernate/SByteType.cs
View File

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

2
OpenSim/Data/NHibernate/Terrain.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlAssetTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlGridTest.cs
View File

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

10
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlInventoryTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlRegionTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateMsSqlUserTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateMySQLAssetTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateMySQLGridTest.cs
View File

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

10
OpenSim/Data/NHibernate/Tests/NHibernateMySQLInventoryTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateMySQLRegionTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateMySQLUserTest.cs
View File

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

8
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLAssetTest.cs
View File

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

8
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLGridTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLInventoryTest.cs
View File

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

8
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLRegionTest.cs
View File

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

8
OpenSim/Data/NHibernate/Tests/NHibernatePostgreSQLUserTest.cs
View File

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

8
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteAssetTest.cs
View File

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

8
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteGridTest.cs
View File

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

9
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteInventoryTest.cs
View File

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

8
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteRegionTest.cs
View File

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

8
OpenSim/Data/NHibernate/Tests/NHibernateSQLiteUserTest.cs
View File

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

4
OpenSim/Data/NHibernate/TextureUserType.cs
View File

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

2
OpenSim/Data/NHibernate/UInt16Type.cs
View File

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

2
OpenSim/Data/NHibernate/UInt32Type.cs
View File

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

2
OpenSim/Data/NHibernate/UInt64Type.cs
View File

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

3
OpenSim/Data/NHibernate/UserFriend.cs
View File

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

2
OpenSim/Data/RegionProfileData.cs
View File

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

2
OpenSim/Data/SQLite/SQLiteAssetData.cs
View File

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

9
OpenSim/Data/SQLite/SQLiteEstateData.cs
View File

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

4
OpenSim/Data/SQLite/SQLiteGridData.cs
View File

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

2
OpenSim/Data/SQLite/SQLiteInventoryStore.cs
View File

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

2
OpenSim/Data/SQLite/SQLiteManager.cs
View File

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

5
OpenSim/Data/SQLite/SQLiteRegionData.cs
View File

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

4
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

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

9
OpenSim/Data/SQLite/Tests/SQLiteAssetTest.cs
View File

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

7
OpenSim/Data/SQLite/Tests/SQLiteEstateTest.cs
View File

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

10
OpenSim/Data/SQLite/Tests/SQLiteInventoryTest.cs
View File

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

9
OpenSim/Data/SQLite/Tests/SQLiteRegionTest.cs
View File

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

9
OpenSim/Data/SQLite/Tests/SQLiteUserTest.cs
View File

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

8
OpenSim/Data/Tests/BasicAssetTest.cs
View File

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

9
OpenSim/Data/Tests/BasicEstateTest.cs
View File

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

6
OpenSim/Data/Tests/BasicGridTest.cs
View File

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

8
OpenSim/Data/Tests/BasicInventoryTest.cs
View File

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

13
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@ -29,14 +29,13 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Text; using System.Text;
using log4net.Config;
using NUnit.Framework; using NUnit.Framework;
using NUnit.Framework.SyntaxHelpers; using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.CoreModules.World.Land;
using OpenMetaverse;
namespace OpenSim.Data.Tests namespace OpenSim.Data.Tests
{ {
@ -71,7 +70,7 @@ namespace OpenSim.Data.Tests
{ {
try try
{ {
log4net.Config.XmlConfigurator.Configure(); XmlConfigurator.Configure();
} }
catch (Exception) catch (Exception)
{ {
@ -140,7 +139,7 @@ namespace OpenSim.Data.Tests
} }
catch (Exception e) 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(); Assert.Fail();
} }
@ -150,7 +149,7 @@ namespace OpenSim.Data.Tests
} }
catch (Exception e) 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(); Assert.Fail();
} }
@ -651,7 +650,7 @@ namespace OpenSim.Data.Tests
} }
[Test] [Test]
[ExpectedException(typeof(System.ArgumentException))] [ExpectedException(typeof(ArgumentException))]
public void T026_PrimInventoryMany() public void T026_PrimInventoryMany()
{ {
UUID i1,i2,i3,i4; UUID i1,i2,i3,i4;

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