From 801da4346aeb3c08969c4845f5c595135a64470a Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 12 Feb 2009 09:53:12 +0000 Subject: * optimized usings. --- OpenSim/Framework/AgentCircuitData.cs | 9 +++------ OpenSim/Framework/AssetBase.cs | 2 -- OpenSim/Framework/AssetConfig.cs | 3 ++- .../AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 2 +- OpenSim/Framework/Cache.cs | 4 ++-- OpenSim/Framework/ChildAgentDataUpdate.cs | 18 +++++++----------- OpenSim/Framework/Client/IClientChat.cs | 3 --- OpenSim/Framework/Communications/Cache/AssetCache.cs | 4 ++-- .../Framework/Communications/Cache/AssetServerBase.cs | 4 ++-- .../Communications/Cache/AuthedSessionCache.cs | 1 - .../Framework/Communications/Cache/CachedUserInfo.cs | 4 +--- .../Communications/Cache/CryptoGridAssetClient.cs | 4 ++-- .../Communications/Cache/InventoryFolderImpl.cs | 1 + .../Communications/Cache/LibraryRootFolder.cs | 2 +- .../Communications/Cache/UserProfileCacheService.cs | 4 +--- OpenSim/Framework/Communications/Capabilities/Caps.cs | 5 ++--- .../Framework/Communications/Capabilities/CapsUtil.cs | 1 - .../Communications/Capabilities/LLSDStreamHandler.cs | 1 - .../Framework/Communications/CommunicationsManager.cs | 3 --- OpenSim/Framework/Communications/GridInfoService.cs | 1 - OpenSim/Framework/Communications/IAvatarService.cs | 3 --- OpenSim/Framework/Communications/IHyperlink.cs | 5 ----- .../Communications/ISecureInventoryService.cs | 4 +--- .../Framework/Communications/InventoryServiceBase.cs | 6 +----- OpenSim/Framework/Communications/LoginResponse.cs | 4 ++-- OpenSim/Framework/Communications/LoginService.cs | 4 ++-- OpenSim/Framework/Communications/RestClient.cs | 2 +- .../Tests/Cache/UserProfileCacheServiceTests.cs | 7 ++----- .../Communications/Tests/Cache/UserProfileTestUtils.cs | 2 -- .../Communications/Tests/LoginServiceTests.cs | 10 ++++------ OpenSim/Framework/Communications/UserManagerBase.cs | 7 +++---- OpenSim/Framework/Communications/XMPP/XmppError.cs | 2 -- OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs | 2 -- .../Framework/Communications/XMPP/XmppMessageStanza.cs | 2 -- .../Communications/XMPP/XmppPresenceStanza.cs | 2 -- .../Framework/Communications/XMPP/XmppSerializer.cs | 4 ---- OpenSim/Framework/Communications/XMPP/XmppStanza.cs | 1 - OpenSim/Framework/Communications/XMPP/XmppWriter.cs | 1 - OpenSim/Framework/ConfigurationMember.cs | 2 +- OpenSim/Framework/Console/ConsoleBase.cs | 17 +++++++++-------- OpenSim/Framework/ForeignUserProfileData.cs | 2 -- OpenSim/Framework/HGNetworkServersInfo.cs | 4 ---- OpenSim/Framework/IClientFileTransfer.cs | 5 +---- OpenSim/Framework/IMoneyModule.cs | 2 -- OpenSim/Framework/IPlugin.cs | 2 +- OpenSim/Framework/IScene.cs | 1 - OpenSim/Framework/InventoryNodeBase.cs | 4 ++-- OpenSim/Framework/LandData.cs | 6 +++--- OpenSim/Framework/Servers/BaseHTTPHandler.cs | 1 - OpenSim/Framework/Servers/BaseHttpServer.cs | 16 ++++++++-------- OpenSim/Framework/Servers/BaseOpenSimServer.cs | 5 +++-- OpenSim/Framework/Servers/BaseStreamHandler.cs | 1 - OpenSim/Framework/Servers/BinaryStreamHandler.cs | 1 - OpenSim/Framework/Servers/IHttpAgentHandler.cs | 4 ---- OpenSim/Framework/Servers/IStreamHandler.cs | 1 - OpenSim/Framework/Servers/OSHttpRequest.cs | 2 +- OpenSim/Framework/Servers/OSHttpResponse.cs | 2 -- OpenSim/Framework/Servers/RestDeserialiseHandler.cs | 1 - OpenSim/Framework/Servers/RestHTTPHandler.cs | 1 - OpenSim/Framework/Servers/RestSessionService.cs | 2 -- OpenSim/Framework/Servers/RestStreamHandler.cs | 1 - OpenSim/Framework/Servers/Tests/OSHttpTests.cs | 9 ++------- OpenSim/Framework/SimStats.cs | 7 ++++--- OpenSim/Framework/Statistics/SimExtraStatsCollector.cs | 1 - OpenSim/Framework/Tests/LocationTest.cs | 2 -- OpenSim/Framework/Tests/UtilTest.cs | 2 +- OpenSim/Framework/UserConfig.cs | 3 ++- OpenSim/Framework/Util.cs | 10 +++++----- OpenSim/Framework/WearableItem.cs | 2 +- 69 files changed, 87 insertions(+), 176 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 9d40af9..1c37601 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs @@ -28,10 +28,7 @@ using System; using System.Collections.Generic; using OpenMetaverse; -using OSD = OpenMetaverse.StructuredData.OSD; -using OSDMap = OpenMetaverse.StructuredData.OSDMap; -using OSDArray = OpenMetaverse.StructuredData.OSDArray; -using OSDParser = OpenMetaverse.StructuredData.OSDParser; +using OpenMetaverse.StructuredData; namespace OpenSim.Framework { @@ -108,13 +105,13 @@ namespace OpenSim.Framework if (args["caps_path"] != null) CapsPath = args["caps_path"].AsString(); - if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OpenMetaverse.StructuredData.OSDType.Array)) + if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OSDType.Array)) { OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]); ChildrenCapSeeds = new Dictionary(); foreach (OSD o in childrenSeeds) { - if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) + if (o.Type == OSDType.Map) { ulong handle = 0; string seed = ""; diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 88ac4a6..dfe559e 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs @@ -26,9 +26,7 @@ */ using System; -using System.Collections.Generic; using OpenMetaverse; -using OpenMetaverse.StructuredData; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs index cc0217f..233c3d0 100644 --- a/OpenSim/Framework/AssetConfig.cs +++ b/OpenSim/Framework/AssetConfig.cs @@ -26,6 +26,7 @@ */ using System; +using System.IO; namespace OpenSim.Framework { @@ -62,7 +63,7 @@ namespace OpenSim.Framework configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Location of 'AssetSets.xml'", - string.Format(".{0}assets{0}AssetSets.xml", System.IO.Path.DirectorySeparatorChar), false); + string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar), false); } public bool handleIncomingConfiguration(string configuration_key, object configuration_result) diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 55b4ebd..01cbfce 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; using System.IO; using System.Reflection; using System.Xml; -using OpenMetaverse; using log4net; using Nini.Config; +using OpenMetaverse; /// /// Loads assets from the filesystem location. Not yet a plugin, though it should be. diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs index 6c37c66..3dab9b6 100644 --- a/OpenSim/Framework/Cache.cs +++ b/OpenSim/Framework/Cache.cs @@ -383,7 +383,7 @@ namespace OpenSim.Framework // Find an object in cache by delegate. // - public Object Find(Predicate d) + public Object Find(Predicate d) { CacheItemBase item = m_Index.Find(d); @@ -460,7 +460,7 @@ namespace OpenSim.Framework if (m_DefaultTTL.Ticks != 0) { - DateTime now= System.DateTime.Now; + DateTime now= DateTime.Now; foreach (CacheItemBase item in new List(m_Index)) { diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 34f2866..0e72e47 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs @@ -26,14 +26,10 @@ */ using System; -using OpenMetaverse; using System.Collections; using System.Collections.Generic; - -using OSD = OpenMetaverse.StructuredData.OSD; -using OSDMap = OpenMetaverse.StructuredData.OSDMap; -using OSDArray = OpenMetaverse.StructuredData.OSDArray; -using OSDParser = OpenMetaverse.StructuredData.OSDParser; +using OpenMetaverse; +using OpenMetaverse.StructuredData; namespace OpenSim.Framework { @@ -486,7 +482,7 @@ namespace OpenSim.Framework if (args["agent_access"] != null) Byte.TryParse(args["agent_access"].AsString(), out AgentAccess); - if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OpenMetaverse.StructuredData.OSDType.Array) + if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array) { OSDArray textures = (OSDArray)(args["agent_textures"]); AgentTextures = new UUID[textures.Count]; @@ -498,28 +494,28 @@ namespace OpenSim.Framework if (args["active_group_id"] != null) ActiveGroupID = args["active_group_id"].AsUUID(); - if ((args["groups"] != null) && (args["groups"]).Type == OpenMetaverse.StructuredData.OSDType.Array) + if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array) { OSDArray groups = (OSDArray)(args["groups"]); Groups = new AgentGroupData[groups.Count]; int i = 0; foreach (OSD o in groups) { - if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) + if (o.Type == OSDType.Map) { Groups[i++] = new AgentGroupData((OSDMap)o); } } } - if ((args["animations"] != null) && (args["animations"]).Type == OpenMetaverse.StructuredData.OSDType.Array) + if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array) { OSDArray anims = (OSDArray)(args["animations"]); Anims = new AgentAnimationData[anims.Count]; int i = 0; foreach (OSD o in anims) { - if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) + if (o.Type == OSDType.Map) { Anims[i++] = new AgentAnimationData((OSDMap)o); } diff --git a/OpenSim/Framework/Client/IClientChat.cs b/OpenSim/Framework/Client/IClientChat.cs index c89bf53..078ea9b 100644 --- a/OpenSim/Framework/Client/IClientChat.cs +++ b/OpenSim/Framework/Client/IClientChat.cs @@ -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.Framework.Client diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 2296e46..1c8f9d6 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -29,11 +29,11 @@ using System; using System.Collections.Generic; using System.Reflection; using System.Threading; +using GlynnTucker.Cache; +using log4net; using OpenMetaverse; using OpenMetaverse.Packets; -using log4net; using OpenSim.Framework.Statistics; -using GlynnTucker.Cache; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index cc5ba8e..5c902ec 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -28,11 +28,11 @@ using System; using System.Reflection; using System.Threading; -using OpenMetaverse; using log4net; +using OpenMetaverse; +using OpenSim.Data; using OpenSim.Framework.AssetLoader.Filesystem; using OpenSim.Framework.Statistics; -using OpenSim.Data; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs index be10e96..d56e48a 100644 --- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs +++ b/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs @@ -27,7 +27,6 @@ using System; using System.Collections.Generic; -using System.Text; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 99a982b..15066cd 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs @@ -28,10 +28,8 @@ using System; using System.Collections.Generic; using System.Reflection; -using System.Threading; - -using OpenMetaverse; using log4net; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs index 038c591..55db289 100644 --- a/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/CryptoGridAssetClient.cs @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) Contributors, http://www.openmetaverse.org/ * See CONTRIBUTORS.TXT for a full list of copyright holders. * @@ -34,11 +34,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Reflection; +using System.Security.Cryptography; using System.Text; using System.Xml.Serialization; using log4net; using OpenSim.Framework.Servers; -using System.Security.Cryptography; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs index 4c629f4..58c3269 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs @@ -28,6 +28,7 @@ using System; using System.Collections.Generic; using OpenMetaverse; + //using System.Reflection; //using log4net; diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 0b05adf..93f126f 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -30,9 +30,9 @@ using System.Collections.Generic; using System.IO; using System.Reflection; using System.Xml; -using OpenMetaverse; using log4net; using Nini.Config; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 22aab10..ef190c8 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs @@ -25,12 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; using System.Reflection; -using System.Threading; -using OpenMetaverse; using log4net; +using OpenMetaverse; namespace OpenSim.Framework.Communications.Cache { diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index cfe9002..b68083e 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -30,11 +30,10 @@ using System.Collections; using System.Collections.Generic; using System.IO; using System.Reflection; -using OpenMetaverse; using log4net; -using OpenSim.Framework.Communications.Cache; +using OpenMetaverse; using OpenSim.Framework.Servers; -using OpenSim.Framework; + // using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Framework.Communications.Capabilities diff --git a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs index 829b4e5..874a27f 100644 --- a/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs +++ b/OpenSim/Framework/Communications/Capabilities/CapsUtil.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using OpenMetaverse; namespace OpenSim.Framework.Communications.Capabilities diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs index c68a205..906f5d5 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs @@ -27,7 +27,6 @@ using System.Collections; using System.IO; -using System.Net; using System.Text; using OpenSim.Framework.Servers; diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 2107f63..936e583 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs @@ -25,11 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; -using System.Reflection; using OpenMetaverse; -using log4net; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs index bd108c1..488ce8e 100644 --- a/OpenSim/Framework/Communications/GridInfoService.cs +++ b/OpenSim/Framework/Communications/GridInfoService.cs @@ -34,7 +34,6 @@ using log4net; using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework.Servers; -using OpenSim.Framework; namespace OpenSim.Framework.Communications { diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs index 25b26dd..3822e9f 100644 --- a/OpenSim/Framework/Communications/IAvatarService.cs +++ b/OpenSim/Framework/Communications/IAvatarService.cs @@ -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.Framework.Communications diff --git a/OpenSim/Framework/Communications/IHyperlink.cs b/OpenSim/Framework/Communications/IHyperlink.cs index fa088d6..6c61d82 100644 --- a/OpenSim/Framework/Communications/IHyperlink.cs +++ b/OpenSim/Framework/Communications/IHyperlink.cs @@ -25,11 +25,6 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * */ -using System; -using System.Collections.Generic; -using System.Text; - -using OpenSim.Framework; namespace OpenSim.Framework.Communications { diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs index 6d4ce46..6da13fe 100644 --- a/OpenSim/Framework/Communications/ISecureInventoryService.cs +++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs @@ -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.Collections.Generic; using OpenMetaverse; -using OpenSim.Framework.Communications.Cache; namespace OpenSim.Framework.Communications { diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 8753c64..de76415 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs @@ -25,14 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; using System.Reflection; -using System.Threading; - -using OpenMetaverse; using log4net; - +using OpenMetaverse; using OpenSim.Data; namespace OpenSim.Framework.Communications diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index 867e9e6..d1b9258 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs @@ -29,10 +29,10 @@ using System; using System.Collections; using System.Collections.Generic; using System.Reflection; -using OpenMetaverse; -using OpenMetaverse.StructuredData; using log4net; using Nwc.XmlRpc; +using OpenMetaverse; +using OpenMetaverse.StructuredData; namespace OpenSim.Framework.Communications { diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index fe904b5..ae16715 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -33,10 +33,10 @@ using System.Reflection; using System.Text.RegularExpressions; using System.Threading; using System.Web; -using OpenMetaverse; -using OpenMetaverse.StructuredData; using log4net; using Nwc.XmlRpc; +using OpenMetaverse; +using OpenMetaverse.StructuredData; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Statistics; diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs index 970f2a9..69932fc 100644 --- a/OpenSim/Framework/Communications/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient.cs @@ -291,7 +291,7 @@ namespace OpenSim.Framework.Communications { _response = (HttpWebResponse) _request.GetResponse(); } - catch (System.Net.WebException e) + catch (WebException e) { m_log.ErrorFormat("[ASSET] Error fetching asset from asset server"); m_log.Debug(e.ToString()); diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index 86d85b1..cda9d5c 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs @@ -25,16 +25,13 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using log4net; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; -//using OpenSim.Framework; +using OpenSim.Data; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Communications.Local; using OpenSim.Tests.Common.Mock; -using OpenSim.Data; +//using OpenSim.Framework; namespace OpenSim.Framework.Communications.Tests { diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs index cf07ae5..85cc940 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs @@ -26,10 +26,8 @@ */ using OpenMetaverse; -using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Communications.Local; -using OpenSim.Tests.Common.Mock; namespace OpenSim.Framework.Communications.Tests { diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index ffa3c5f..57ed0f5 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs @@ -29,8 +29,6 @@ using System; using System.Collections; using System.Net; using System.Text.RegularExpressions; -using System.Xml; -using Nini; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using Nwc.XmlRpc; @@ -61,7 +59,7 @@ namespace OpenSim.Framework.Communications.Tests IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); CommunicationsManager commsManager - = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43)); + = new TestCommunicationsManager(new NetworkServersInfo(42, 43)); commsManager.GridService.RegisterRegion( new RegionInfo(42, 43, capsEndPoint, regionExternalName)); @@ -89,7 +87,7 @@ namespace OpenSim.Framework.Communications.Tests Assert.That(responseData["first_name"], Is.EqualTo(firstName)); Assert.That(responseData["last_name"], Is.EqualTo(lastName)); Assert.That( - responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); + responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue)); Regex capsSeedPattern = new Regex("^http://" @@ -108,7 +106,7 @@ namespace OpenSim.Framework.Communications.Tests IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); CommunicationsManager commsManager - = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43)); + = new TestCommunicationsManager(new NetworkServersInfo(42, 43)); commsManager.GridService.RegisterRegion( new RegionInfo(42, 43, capsEndPoint, regionExternalName)); @@ -159,7 +157,7 @@ namespace OpenSim.Framework.Communications.Tests Hashtable invlibroothash = (Hashtable) invlibroot[0]; Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000")); Assert.That( - responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); + responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue)); Assert.That(responseData["message"], Is.EqualTo("Hello folks")); Assert.That(responseData["buddy-list"], Is.Empty); Assert.That(responseData["start_location"], Is.EqualTo("last")); diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 0af9652..62c3f89 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -26,17 +26,16 @@ */ using System; -using System.Collections; using System.Collections.Generic; using System.Net; using System.Reflection; using System.Security.Cryptography; -using OpenMetaverse; -using OpenMetaverse.StructuredData; using log4net; using Nwc.XmlRpc; -using OpenSim.Framework.Statistics; +using OpenMetaverse; +using OpenMetaverse.StructuredData; using OpenSim.Data; +using OpenSim.Framework.Statistics; namespace OpenSim.Framework.Communications { diff --git a/OpenSim/Framework/Communications/XMPP/XmppError.cs b/OpenSim/Framework/Communications/XMPP/XmppError.cs index 1698b6a..8b7e502 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppError.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppError.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Xml; using System.Xml.Serialization; namespace OpenSim.Framework.Communications.XMPP diff --git a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs index 1789536..26a98ec 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppIqStanza.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Xml; using System.Xml.Serialization; namespace OpenSim.Framework.Communications.XMPP diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs index fd4cd5f..d150708 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Xml; using System.Xml.Serialization; namespace OpenSim.Framework.Communications.XMPP diff --git a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs index d63a0d1..95d2ca3 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppPresenceStanza.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Xml; using System.Xml.Serialization; namespace OpenSim.Framework.Communications.XMPP diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs index eb9dabe..888686b 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs @@ -27,12 +27,8 @@ using System; using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Text; using System.Xml; using System.Xml.Serialization; -using log4net; namespace OpenSim.Framework.Communications.XMPP { diff --git a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs index 00df14a..db3c5eb 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppStanza.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppStanza.cs @@ -26,7 +26,6 @@ */ using System; -using System.Xml; using System.Xml.Serialization; namespace OpenSim.Framework.Communications.XMPP diff --git a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs index c5ad9b4..4937f7a 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs @@ -28,7 +28,6 @@ using System.IO; using System.Text; using System.Xml; - using IOStream = System.IO.Stream; namespace OpenSim.Framework.Communications.XMPP diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs index b54aafb..1868168 100644 --- a/OpenSim/Framework/ConfigurationMember.cs +++ b/OpenSim/Framework/ConfigurationMember.cs @@ -288,7 +288,7 @@ namespace OpenSim.Framework // if the first character is a "$", assume it's the name // of an environment variable and substitute with the value of that variable if (console_result.StartsWith("$")) - console_result = System.Environment.GetEnvironmentVariable(console_result.Substring(1)); + console_result = Environment.GetEnvironmentVariable(console_result.Substring(1)); switch (configOption.configurationType) { diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 721e91a..793270b 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs @@ -26,10 +26,11 @@ */ using System; -using System.Text; -using System.Reflection; -using System.Diagnostics; using System.Collections.Generic; +using System.Diagnostics; +using System.Reflection; +using System.Text; +using System.Threading; using log4net; namespace OpenSim.Framework.Console @@ -77,8 +78,8 @@ namespace OpenSim.Framework.Console /// /// Commands organized by keyword in a tree /// - private Dictionary tree = - new Dictionary(); + private Dictionary tree = + new Dictionary(); /// /// Get help for the given help string @@ -149,7 +150,7 @@ namespace OpenSim.Framework.Console return help; } - private List CollectHelp(Dictionary dict) + private List CollectHelp(Dictionary dict) { List result = new List(); @@ -708,7 +709,7 @@ namespace OpenSim.Framework.Console public void LockOutput() { - System.Threading.Monitor.Enter(cmdline); + Monitor.Enter(cmdline); try { if (y != -1) @@ -738,7 +739,7 @@ namespace OpenSim.Framework.Console y = System.Console.CursorTop; Show(); } - System.Threading.Monitor.Exit(cmdline); + Monitor.Exit(cmdline); } public void Output(string text) diff --git a/OpenSim/Framework/ForeignUserProfileData.cs b/OpenSim/Framework/ForeignUserProfileData.cs index 4f734a7..f971eb0 100644 --- a/OpenSim/Framework/ForeignUserProfileData.cs +++ b/OpenSim/Framework/ForeignUserProfileData.cs @@ -28,8 +28,6 @@ using System; -using OpenSim.Framework; - namespace OpenSim.Framework { public class ForeignUserProfileData : UserProfileData diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs index 227200e..803c712 100644 --- a/OpenSim/Framework/HGNetworkServersInfo.cs +++ b/OpenSim/Framework/HGNetworkServersInfo.cs @@ -26,12 +26,8 @@ * */ -using System; -using System.Collections.Generic; using System.Net; -using OpenSim.Framework; - namespace OpenSim.Framework { public class HGNetworkServersInfo diff --git a/OpenSim/Framework/IClientFileTransfer.cs b/OpenSim/Framework/IClientFileTransfer.cs index ac5fc2b..f947b17 100644 --- a/OpenSim/Framework/IClientFileTransfer.cs +++ b/OpenSim/Framework/IClientFileTransfer.cs @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) Contributors, http://opensimulator.org/ * See CONTRIBUTORS.TXT for a full list of copyright holders. * @@ -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.Framework diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs index 7904e94..ae31e3c 100644 --- a/OpenSim/Framework/IMoneyModule.cs +++ b/OpenSim/Framework/IMoneyModule.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using OpenSim.Framework; using OpenMetaverse; namespace OpenSim.Framework diff --git a/OpenSim/Framework/IPlugin.cs b/OpenSim/Framework/IPlugin.cs index 1eb1c06..01ea475 100644 --- a/OpenSim/Framework/IPlugin.cs +++ b/OpenSim/Framework/IPlugin.cs @@ -42,7 +42,7 @@ namespace OpenSim.Framework /// /// This interface, describes a generic plugin /// - public interface IPlugin : System.IDisposable + public interface IPlugin : IDisposable { /// /// Returns the plugin version diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 1c0a3b5..c400309 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework.Console; diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs index 6f61ab5..6c9b86d 100644 --- a/OpenSim/Framework/InventoryNodeBase.cs +++ b/OpenSim/Framework/InventoryNodeBase.cs @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenMetaverse; - +using OpenMetaverse; + namespace OpenSim.Framework { /// diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 2ff59cd..f361cc3 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs @@ -125,7 +125,7 @@ namespace OpenSim.Framework } } - public OpenMetaverse.Parcel.ParcelCategory Category { + public Parcel.ParcelCategory Category { get { return _category; } @@ -233,7 +233,7 @@ namespace OpenSim.Framework } } - public OpenMetaverse.Parcel.ParcelStatus Status { + public Parcel.ParcelStatus Status { get { return _status; } @@ -314,7 +314,7 @@ namespace OpenSim.Framework } } - public List ParcelAccessList { + public List ParcelAccessList { get { return _parcelAccessList; } diff --git a/OpenSim/Framework/Servers/BaseHTTPHandler.cs b/OpenSim/Framework/Servers/BaseHTTPHandler.cs index a7c3562..2aa37fb 100644 --- a/OpenSim/Framework/Servers/BaseHTTPHandler.cs +++ b/OpenSim/Framework/Servers/BaseHTTPHandler.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections; namespace OpenSim.Framework.Servers diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index d69b2c0..620a7f6 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -35,12 +35,12 @@ using System.Reflection; using System.Text; using System.Threading; using System.Xml; -using OpenMetaverse.StructuredData; +using HttpServer; using log4net; using Nwc.XmlRpc; +using OpenMetaverse.StructuredData; using CoolHTTPListener = HttpServer.HttpListener; -using IHttpClientContext = HttpServer.IHttpClientContext; -using IHttpRequest = HttpServer.IHttpRequest; +using HttpListener=System.Net.HttpListener; namespace OpenSim.Framework.Servers { @@ -219,7 +219,7 @@ namespace OpenSim.Framework.Servers public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request) { OSHttpRequest req = new OSHttpRequest(context, request); - OSHttpResponse resp = new OSHttpResponse(new HttpServer.HttpResponse(context, request)); + OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request)); //resp.KeepAlive = req.KeepAlive; //m_log.Info("[Debug BASE HTTP SERVER]: Got Request"); //HttpServerContextObj objstate= new HttpServerContextObj(req,resp); @@ -1373,7 +1373,7 @@ namespace OpenSim.Framework.Servers { //m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); //m_httpListener.Prefixes.Add("http://10.1.1.5:" + m_port + "/"); - m_httpListener2 = new HttpServer.HttpListener(IPAddress.Any, (int)m_port); + m_httpListener2 = new CoolHTTPListener(IPAddress.Any, (int)m_port); m_httpListener2.ExceptionThrown += httpServerException; m_httpListener2.LogWriter = httpserverlog; @@ -1408,7 +1408,7 @@ namespace OpenSim.Framework.Servers } } - public void httpServerDisconnectMonitor(HttpServer.IHttpClientContext source, SocketError err) + public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err) { switch (err) { @@ -1564,11 +1564,11 @@ namespace OpenSim.Framework.Servers /// Relays HttpServer log messages to our own logging mechanism. /// /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information - public class HttpServerLogWriter : HttpServer.ILogWriter + public class HttpServerLogWriter : ILogWriter { //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public void Write(object source, HttpServer.LogPrio priority, string message) + public void Write(object source, LogPrio priority, string message) { /* switch (priority) diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index ff53e1a..4cbbecc 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -38,6 +38,7 @@ using log4net.Core; using log4net.Repository; using OpenSim.Framework.Console; using OpenSim.Framework.Statistics; +using Timer=System.Timers.Timer; namespace OpenSim.Framework.Servers { @@ -52,7 +53,7 @@ namespace OpenSim.Framework.Servers /// This will control a periodic log printout of the current 'show stats' (if they are active) for this /// server. /// - private System.Timers.Timer m_periodicDiagnosticsTimer = new System.Timers.Timer(60 * 60 * 1000); + private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000); protected ConsoleBase m_console; @@ -266,7 +267,7 @@ namespace OpenSim.Framework.Servers // If there is no threshold set then the threshold is effectively everything. Level thresholdLevel - = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All); + = (null != consoleAppender.Threshold ? consoleAppender.Threshold : Level.All); Notice(String.Format("Console log level is {0}", thresholdLevel)); } diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs index 6b0614f..771def4 100644 --- a/OpenSim/Framework/Servers/BaseStreamHandler.cs +++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs @@ -26,7 +26,6 @@ */ using System.IO; -using System.Net; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/BinaryStreamHandler.cs index 26a6f10..6540798 100644 --- a/OpenSim/Framework/Servers/BinaryStreamHandler.cs +++ b/OpenSim/Framework/Servers/BinaryStreamHandler.cs @@ -27,7 +27,6 @@ using System.IO; using System.Text; -using System.Net; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/IHttpAgentHandler.cs index ff3a5b9..e6ad57e 100644 --- a/OpenSim/Framework/Servers/IHttpAgentHandler.cs +++ b/OpenSim/Framework/Servers/IHttpAgentHandler.cs @@ -25,10 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections; -using System.IO; -using System.Net; - namespace OpenSim.Framework.Servers { public interface IHttpAgentHandler diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/IStreamHandler.cs index b3ce34d..76bf4d5 100644 --- a/OpenSim/Framework/Servers/IStreamHandler.cs +++ b/OpenSim/Framework/Servers/IStreamHandler.cs @@ -27,7 +27,6 @@ using System.Collections; using System.IO; -using System.Net; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs index 4c7d7ce..8e0cb38 100644 --- a/OpenSim/Framework/Servers/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/OSHttpRequest.cs @@ -29,8 +29,8 @@ using System; using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; -using System.Net; using System.IO; +using System.Net; using System.Reflection; using System.Text; using HttpServer; diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs index 4947156..ff02edd 100644 --- a/OpenSim/Framework/Servers/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/OSHttpResponse.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections; using System.IO; using System.Net; using System.Text; diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs index 5c2dd4a..41d86e5 100644 --- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs +++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs @@ -26,7 +26,6 @@ */ using System.IO; -using System.Net; using System.Xml; using System.Xml.Serialization; diff --git a/OpenSim/Framework/Servers/RestHTTPHandler.cs b/OpenSim/Framework/Servers/RestHTTPHandler.cs index 2974c56..5722885 100644 --- a/OpenSim/Framework/Servers/RestHTTPHandler.cs +++ b/OpenSim/Framework/Servers/RestHTTPHandler.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections; namespace OpenSim.Framework.Servers diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs index 958ee26..60da05e 100644 --- a/OpenSim/Framework/Servers/RestSessionService.cs +++ b/OpenSim/Framework/Servers/RestSessionService.cs @@ -28,12 +28,10 @@ using System; using System.IO; using System.Net; -using System.Collections.Generic; using System.Reflection; using System.Text; using System.Xml; using System.Xml.Serialization; - using log4net; namespace OpenSim.Framework.Servers diff --git a/OpenSim/Framework/Servers/RestStreamHandler.cs b/OpenSim/Framework/Servers/RestStreamHandler.cs index 44c9dfc..afd7fe5 100644 --- a/OpenSim/Framework/Servers/RestStreamHandler.cs +++ b/OpenSim/Framework/Servers/RestStreamHandler.cs @@ -27,7 +27,6 @@ using System.IO; using System.Text; -using System.Net; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs index fe553c9..3a297bf 100644 --- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs +++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs @@ -31,23 +31,18 @@ using System.IO; using System.Net; using System.Net.Sockets; using System.Text; - using HttpServer; -using HttpServer.Exceptions; using HttpServer.FormDecoders; - using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; -using OpenSim.Framework.Servers; - namespace OpenSim.Framework.Servers.Tests { [TestFixture] public class OSHttpTests { // we need an IHttpClientContext for our tests - public class TestHttpClientContext: HttpServer.IHttpClientContext + public class TestHttpClientContext: IHttpClientContext { private bool _secured; public bool Secured @@ -68,7 +63,7 @@ namespace OpenSim.Framework.Servers.Tests public void Send(byte[] buffer, int offset, int size) {} } - public class TestHttpRequest: HttpServer.IHttpRequest + public class TestHttpRequest: IHttpRequest { public bool BodyIsComplete { diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs index 865dee2..8280708 100644 --- a/OpenSim/Framework/SimStats.cs +++ b/OpenSim/Framework/SimStats.cs @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using OpenMetaverse; using OpenMetaverse.Packets; namespace OpenSim.Framework @@ -73,15 +74,15 @@ namespace OpenSim.Framework } private uint m_objectCapacity; - public OpenMetaverse.UUID RegionUUID + public UUID RegionUUID { get { return regionUUID;} } - private OpenMetaverse.UUID regionUUID; + private UUID regionUUID; public SimStats( uint regionX, uint regionY, uint regionFlags, uint objectCapacity, - SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, OpenMetaverse.UUID pRUUID) + SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, UUID pRUUID) { regionUUID = pRUUID; m_regionX = regionX; diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs index 43c73b2..ce654eb 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs @@ -29,7 +29,6 @@ using System; using System.Collections.Generic; using System.Text; using OpenMetaverse; -using OpenMetaverse.Packets; using OpenSim.Framework.Statistics.Interfaces; namespace OpenSim.Framework.Statistics diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs index 5617e2b..b45a42f 100644 --- a/OpenSim/Framework/Tests/LocationTest.cs +++ b/OpenSim/Framework/Tests/LocationTest.cs @@ -25,9 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenMetaverse; using NUnit.Framework; -using NUnit.Framework.SyntaxHelpers; namespace OpenSim.Framework.Tests { diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs index 0224356..c5f1800 100644 --- a/OpenSim/Framework/Tests/UtilTest.cs +++ b/OpenSim/Framework/Tests/UtilTest.cs @@ -25,9 +25,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenMetaverse; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; +using OpenMetaverse; using OpenSim.Tests.Common; namespace OpenSim.Framework.Tests diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index cc048b7..901b57a 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs @@ -26,6 +26,7 @@ */ using System; +using System.IO; namespace OpenSim.Framework { @@ -113,7 +114,7 @@ namespace OpenSim.Framework configMember.addConfigurationOption("library_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Path to library control file", - string.Format(".{0}inventory{0}Libraries.xml", System.IO.Path.DirectorySeparatorChar), false); + string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false); configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Data.MySQL.dll", false); diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index df7a552..9949ad8 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -194,7 +194,7 @@ namespace OpenSim.Framework } public static T Clamp(T x, T min, T max) - where T : System.IComparable + where T : IComparable { return x.CompareTo(max) > 0 ? max : x.CompareTo(min) < 0 ? min : @@ -758,8 +758,8 @@ namespace OpenSim.Framework memory.Read(compressed, 0, compressed.Length); byte[] compressedBuffer = new byte[compressed.Length + 4]; - System.Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length); - System.Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4); + Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length); + Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4); return Convert.ToBase64String(compressedBuffer); } @@ -872,9 +872,9 @@ namespace OpenSim.Framework { string os = String.Empty; - if (System.Environment.OSVersion.Platform != PlatformID.Unix) + if (Environment.OSVersion.Platform != PlatformID.Unix) { - os = System.Environment.OSVersion.ToString(); + os = Environment.OSVersion.ToString(); } else { diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs index 414b135..7a4b4de 100644 --- a/OpenSim/Framework/WearableItem.cs +++ b/OpenSim/Framework/WearableItem.cs @@ -132,7 +132,7 @@ namespace OpenSim.Framework //int randNum = Util.RandomClass.Next(0, 1000); float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue; // float val =((float) randNum )/ ((float)(1000.0f / range)); - float val = (float)OpenSim.Framework.Util.RandomClass.NextDouble() * range * 0.2f; + float val = (float)Util.RandomClass.NextDouble() * range * 0.2f; setting.Value = setting.VisualParam.MinValue + (range / 2) + val; } } -- cgit v1.1