From fef3b3689492dea63693c964bcdbec9f5137eb5e Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Mon, 21 Apr 2008 07:09:17 +0000 Subject: * Optimised using statements and namespace references across entire project (this took a while to run). --- OpenSim/Framework/AgentInventory.cs | 5 +++-- OpenSim/Framework/AssetConfig.cs | 1 - .../AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 8 +++----- OpenSim/Framework/AvatarPickerAvatar.cs | 3 --- OpenSim/Framework/AvatarWearable.cs | 6 +++--- OpenSim/Framework/ClientManager.cs | 8 +++++--- OpenSim/Framework/Communications/CAPSService.cs | 3 ++- OpenSim/Framework/Communications/Cache/AssetCache.cs | 10 +++++----- OpenSim/Framework/Communications/Cache/AssetServer.cs | 5 +++-- .../Framework/Communications/Cache/AssetServerBase.cs | 10 +++++----- OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 7 ++++--- .../Framework/Communications/Cache/GridAssetClient.cs | 5 +++-- .../Framework/Communications/Cache/LibraryRootFolder.cs | 13 +++++++------ OpenSim/Framework/Communications/Cache/SQLAssetServer.cs | 4 ++-- .../Communications/Cache/UserProfileCacheService.cs | 10 ++++------ OpenSim/Framework/Communications/Capabilities/Caps.cs | 9 ++++----- .../Communications/Capabilities/CapsHandlers.cs | 6 ------ .../Capabilities/LLSDAssetUploadComplete.cs | 2 +- .../Capabilities/LLSDAssetUploadRequest.cs | 9 +++++---- .../Capabilities/LLSDAssetUploadResponse.cs | 6 ++++-- .../Communications/Capabilities/LLSDInventoryItem.cs | 3 --- .../Capabilities/LLSDParcelVoiceInfoResponse.cs | 1 - .../Capabilities/LLSDVoiceAccountResponse.cs | 2 -- .../Framework/Communications/CommunicationsManager.cs | 4 +++- OpenSim/Framework/Communications/IInventoryServices.cs | 2 -- OpenSim/Framework/Communications/InventoryServiceBase.cs | 6 +++--- .../Communications/Limit/IRequestLimitStrategy.cs | 2 -- .../Framework/Communications/Limit/NullLimitStrategy.cs | 2 -- .../Communications/Limit/RepeatLimitStrategy.cs | 1 - .../Framework/Communications/Limit/TimeLimitStrategy.cs | 2 +- OpenSim/Framework/Communications/LoginResponse.cs | 5 +++-- OpenSim/Framework/Communications/LoginService.cs | 11 ++++++----- .../Framework/Communications/RestClient/RestClient.cs | 5 +++-- OpenSim/Framework/Communications/UserManagerBase.cs | 6 +++--- OpenSim/Framework/Communications/XMPP/Stanza.cs | 2 -- OpenSim/Framework/Communications/XMPP/XMPPParser.cs | 6 ------ .../Framework/Configuration/HTTP/HTTPConfiguration.cs | 8 +++++--- .../Framework/Configuration/HTTP/RemoteConfigSettings.cs | 4 +++- OpenSim/Framework/ConfigurationMember.cs | 3 ++- OpenSim/Framework/Console/ConsoleBase.cs | 5 +++-- OpenSim/Framework/Console/OpenSimAppender.cs | 7 +------ OpenSim/Framework/Constants.cs | 4 ---- OpenSim/Framework/EstateSettings.cs | 5 +++-- OpenSim/Framework/FriendListItem.cs | 2 -- OpenSim/Framework/GridConfig.cs | 1 - OpenSim/Framework/GridInstantMessage.cs | 1 - OpenSim/Framework/IAssetServer.cs | 2 -- OpenSim/Framework/IInventoryData.cs | 2 -- OpenSim/Framework/InventoryCollection.cs | 2 -- OpenSim/Framework/InventoryConfig.cs | 12 ++++++------ OpenSim/Framework/InventoryFolderBase.cs | 3 --- OpenSim/Framework/InventoryItemBase.cs | 3 --- OpenSim/Framework/JId.cs | 2 -- OpenSim/Framework/LandData.cs | 2 +- OpenSim/Framework/Login.cs | 3 ++- OpenSim/Framework/MessageServerConfig.cs | 5 +---- OpenSim/Framework/NetworkServersInfo.cs | 2 +- OpenSim/Framework/PacketPool.cs | 15 ++++++++------- OpenSim/Framework/RegionCommsListener.cs | 2 +- OpenSim/Framework/RegionInfo.cs | 1 - .../RegionLoader/Filesystem/RegionLoaderFileSystem.cs | 3 ++- .../Framework/RegionLoader/Web/RegionLoaderWebServer.cs | 12 +++++++----- OpenSim/Framework/RegionUpData.cs | 2 -- OpenSim/Framework/SerializableInventory.cs | 2 -- OpenSim/Framework/Servers/BaseHttpServer.cs | 14 ++++++++------ OpenSim/Framework/Servers/GenericHTTPMethod.cs | 1 - OpenSim/Framework/Servers/MessageServerInfo.cs | 2 -- OpenSim/Framework/Statistics/AssetStatsReporter.cs | 1 - .../Statistics/Interfaces/IPullStatsProvider.cs | 2 -- OpenSim/Framework/Statistics/SimExtraStatsReporter.cs | 5 +---- OpenSim/Framework/Statistics/UserStatsReporter.cs | 1 - OpenSim/Framework/TaskInventoryItem.cs | 7 ++++--- OpenSim/Framework/ThreadTracker.cs | 11 +++++------ OpenSim/Framework/UserConfig.cs | 1 - OpenSim/Framework/Util.cs | 16 +++++++++------- 75 files changed, 158 insertions(+), 208 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs index 916cdf8..ef3ad16 100644 --- a/OpenSim/Framework/AgentInventory.cs +++ b/OpenSim/Framework/AgentInventory.cs @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using System.Collections.Generic; using libsecondlife; using libsecondlife.Packets; @@ -230,7 +231,7 @@ namespace OpenSim.Framework public LLUUID CreatorID; public sbyte InvType; public sbyte Type; - public string Name = System.String.Empty; + public string Name = String.Empty; public string Description; public InventoryItem() @@ -241,7 +242,7 @@ namespace OpenSim.Framework public string ExportString() { string typ = "notecard"; - string result = System.String.Empty; + string result = String.Empty; result += "\tinv_object\t0\n\t{\n"; result += "\t\tobj_id\t%s\n"; result += "\t\tparent_id\t" + ItemID.ToString() + "\n"; diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs index 8a4ce92..6f43693 100644 --- a/OpenSim/Framework/AssetConfig.cs +++ b/OpenSim/Framework/AssetConfig.cs @@ -26,7 +26,6 @@ */ using System; -using OpenSim.Framework.Console; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 4afea42..0cc10c4 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs @@ -28,14 +28,12 @@ using System; using System.Collections.Generic; using System.IO; +using System.Reflection; using System.Xml; - using libsecondlife; +using log4net; using Nini.Config; -using OpenSim.Framework; -using OpenSim.Framework.Console; - /// /// Loads assets from the filesystem location. Not yet a plugin, though it should be. /// @@ -43,7 +41,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem { public class AssetLoaderFileSystem : IAssetLoader { - 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); protected AssetBase CreateAsset(string assetIdStr, string name, string path, bool isImage) { diff --git a/OpenSim/Framework/AvatarPickerAvatar.cs b/OpenSim/Framework/AvatarPickerAvatar.cs index 2a60a8e..26a5bb2 100644 --- a/OpenSim/Framework/AvatarPickerAvatar.cs +++ b/OpenSim/Framework/AvatarPickerAvatar.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 libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs index b800030..cd5f7f6 100644 --- a/OpenSim/Framework/AvatarWearable.cs +++ b/OpenSim/Framework/AvatarWearable.cs @@ -25,10 +25,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; using System; using System.Runtime.Serialization; using System.Security.Permissions; +using libsecondlife; namespace OpenSim.Framework { @@ -77,7 +77,7 @@ namespace OpenSim.Framework //System.Console.WriteLine("AvatarWearable Deserialize BGN"); if (info == null) { - throw new System.ArgumentNullException("info"); + throw new ArgumentNullException("info"); } AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid))); @@ -93,7 +93,7 @@ namespace OpenSim.Framework { if (info == null) { - throw new System.ArgumentNullException("info"); + throw new ArgumentNullException("info"); } info.AddValue("AssetID", AssetID.UUID); diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs index 40c04c3..160d5b6 100644 --- a/OpenSim/Framework/ClientManager.cs +++ b/OpenSim/Framework/ClientManager.cs @@ -27,8 +27,10 @@ using System; using System.Collections.Generic; +using System.Reflection; using libsecondlife; using libsecondlife.Packets; +using log4net; namespace OpenSim.Framework { @@ -36,7 +38,7 @@ namespace OpenSim.Framework public class ClientManager { - 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 Dictionary m_clients; @@ -56,7 +58,7 @@ namespace OpenSim.Framework { whatToDo(LocalClients[i]); } - catch (System.Exception e) + catch (Exception e) { m_log.Warn("[CLIENT]: Unable to do ForEachClient for one of the clients" + "\n Reason: " + e.ToString()); } @@ -129,7 +131,7 @@ namespace OpenSim.Framework client.Close(false); } } - catch (System.Exception e) + catch (Exception e) { m_log.Error(string.Format("[CLIENT]: Unable to shutdown circuit for: {0}\n Reason: {1}", agentId, e)); } diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs index 133ba0d..caf96ff 100644 --- a/OpenSim/Framework/Communications/CAPSService.cs +++ b/OpenSim/Framework/Communications/CAPSService.cs @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using OpenSim.Framework.Servers; namespace OpenSim.Framework.Communications @@ -47,7 +48,7 @@ namespace OpenSim.Framework.Communications public string CapsRequest(string request, string path, string param) { System.Console.WriteLine("new caps request " + request + " from path " + path); - return System.String.Empty; + return String.Empty; } } } diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 4d37e74..c81ea35 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -27,11 +27,11 @@ using System; using System.Collections.Generic; +using System.Reflection; using System.Threading; using libsecondlife; using libsecondlife.Packets; - -using OpenSim.Framework.Console; +using log4net; using OpenSim.Framework.Statistics; namespace OpenSim.Framework.Communications.Cache @@ -52,8 +52,8 @@ namespace OpenSim.Framework.Communications.Cache /// public class AssetCache : IAssetReceiver { - 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); /// /// The cache of assets. This does not include textures. @@ -170,7 +170,7 @@ namespace OpenSim.Framework.Communications.Cache m_assetCacheThread.Name = "AssetCacheThread"; m_assetCacheThread.IsBackground = true; m_assetCacheThread.Start(); - OpenSim.Framework.ThreadTracker.Add(m_assetCacheThread); + ThreadTracker.Add(m_assetCacheThread); } /// diff --git a/OpenSim/Framework/Communications/Cache/AssetServer.cs b/OpenSim/Framework/Communications/Cache/AssetServer.cs index 3ce28c2..891fa6d 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServer.cs @@ -25,16 +25,17 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ using System.IO; +using System.Reflection; using Db4objects.Db4o; using Db4objects.Db4o.Query; using libsecondlife; -using OpenSim.Framework.Console; +using log4net; namespace OpenSim.Framework.Communications.Cache { public class LocalAssetServer : AssetServerBase { - 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 IObjectContainer db; diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index 261b697..1a7f872 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -26,18 +26,18 @@ */ using System; -using System.Collections.Generic; +using System.Reflection; using System.Threading; using libsecondlife; -using OpenSim.Framework.Console; +using log4net; using OpenSim.Framework.AssetLoader.Filesystem; namespace OpenSim.Framework.Communications.Cache { public abstract class AssetServerBase : IAssetServer { - 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); protected IAssetReceiver m_receiver; protected BlockingQueue m_assetRequests; @@ -100,7 +100,7 @@ namespace OpenSim.Framework.Communications.Cache m_localAssetServerThread.Name = "LocalAssetServerThread"; m_localAssetServerThread.IsBackground = true; m_localAssetServerThread.Start(); - OpenSim.Framework.ThreadTracker.Add(m_localAssetServerThread); + ThreadTracker.Add(m_localAssetServerThread); } private void RunRequests() diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index ec5717e..a245af1 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs @@ -27,8 +27,9 @@ using System; using System.Collections.Generic; - +using System.Reflection; using libsecondlife; +using log4net; namespace OpenSim.Framework.Communications.Cache { @@ -37,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache /// public class CachedUserInfo { - 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); /// /// The comms manager holds references to services (user, grid, inventory, etc.) diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 3e703d2..d5b7fea 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs @@ -27,15 +27,16 @@ using System; using System.IO; +using System.Reflection; using System.Xml.Serialization; -using OpenSim.Framework.Console; +using log4net; using OpenSim.Framework.Servers; namespace OpenSim.Framework.Communications.Cache { public class GridAssetClient : AssetServerBase { - 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 _assetServerUrl; diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 03036d0..a39738d 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -28,10 +28,11 @@ using System; using System.Collections.Generic; using System.IO; +using System.Reflection; using System.Xml; using libsecondlife; +using log4net; using Nini.Config; -using OpenSim.Framework.Console; namespace OpenSim.Framework.Communications.Cache { @@ -41,7 +42,7 @@ namespace OpenSim.Framework.Communications.Cache /// public class LibraryRootFolder : InventoryFolderImpl { - 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 LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); @@ -153,13 +154,13 @@ namespace OpenSim.Framework.Communications.Cache { string foldersPath = Path.Combine( - Util.inventoryDir(), config.GetString("foldersFile", System.String.Empty)); + Util.inventoryDir(), config.GetString("foldersFile", String.Empty)); LoadFromFile(foldersPath, "Library folders", ReadFolderFromConfig); string itemsPath = Path.Combine( - Util.inventoryDir(), config.GetString("itemsFile", System.String.Empty)); + Util.inventoryDir(), config.GetString("itemsFile", String.Empty)); LoadFromFile(itemsPath, "Library items", ReadItemFromConfig); } @@ -209,8 +210,8 @@ namespace OpenSim.Framework.Communications.Cache item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); item.AssetID = new LLUUID(config.GetString("assetID", LLUUID.Random().ToString())); item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); - item.Description = config.GetString("description", System.String.Empty); - item.Name = config.GetString("name", System.String.Empty); + item.Description = config.GetString("description", String.Empty); + item.Name = config.GetString("name", String.Empty); item.AssetType = config.GetInt("assetType", 0); item.InvType = config.GetInt("inventoryType", 0); item.CurrentPermissions = (uint)config.GetLong("currentPermissions", 0x7FFFFFFF); diff --git a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs index 4f1a304..1afec70 100644 --- a/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs +++ b/OpenSim/Framework/Communications/Cache/SQLAssetServer.cs @@ -27,13 +27,13 @@ using System; using System.Reflection; -using OpenSim.Framework.Console; +using log4net; namespace OpenSim.Framework.Communications.Cache { public class SQLAssetServer : AssetServerBase { - 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); public SQLAssetServer(string pluginName) { diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 9813756..bf8ff40 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs @@ -25,13 +25,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; +using System.Reflection; using System.Threading; - using libsecondlife; - -using OpenSim.Framework.Console; +using log4net; namespace OpenSim.Framework.Communications.Cache { @@ -40,8 +38,8 @@ namespace OpenSim.Framework.Communications.Cache /// public class UserProfileCacheService { - 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); /// /// The comms manager holds references to services (user, grid, inventory, etc.) diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 2eff9c2..c07744c 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -29,12 +29,11 @@ using System; using System.Collections; using System.Collections.Generic; using System.IO; - +using System.Reflection; using libsecondlife; - +using log4net; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Console; using OpenSim.Framework.Servers; namespace OpenSim.Region.Capabilities @@ -66,8 +65,8 @@ namespace OpenSim.Region.Capabilities public class Caps { - 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 m_httpListenerHostName; private uint m_httpListenPort; diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs index 6992bd1..3e3ae16 100644 --- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs +++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs @@ -25,14 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections; using System.Collections.Generic; -using System.IO; -using libsecondlife; -using OpenSim.Framework; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Console; using OpenSim.Framework.Servers; namespace OpenSim.Region.Capabilities diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs index 876b8d3..1393523 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadComplete.cs @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; using System; +using libsecondlife; namespace OpenSim.Region.Capabilities { diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs index fb64c75..e71a73e 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using libsecondlife; namespace OpenSim.Region.Capabilities @@ -32,11 +33,11 @@ namespace OpenSim.Region.Capabilities [LLSDMap] public class LLSDAssetUploadRequest { - public string asset_type = System.String.Empty; - public string description = System.String.Empty; + public string asset_type = String.Empty; + public string description = String.Empty; public LLUUID folder_id = LLUUID.Zero; - public string inventory_type = System.String.Empty; - public string name = System.String.Empty; + public string inventory_type = String.Empty; + public string name = String.Empty; public LLSDAssetUploadRequest() { diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs index fb721f0..bb293ba 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs @@ -25,13 +25,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; + namespace OpenSim.Region.Capabilities { [LLSDMap] public class LLSDAssetUploadResponse { - public string uploader = System.String.Empty; - public string state = System.String.Empty; + public string uploader = String.Empty; + public string state = String.Empty; public LLSDAssetUploadResponse() { diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs index 36a2cbf..d402579 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDInventoryItem.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 libsecondlife; namespace OpenSim.Region.Capabilities diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs index 4fb0544..4439346 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs @@ -27,7 +27,6 @@ */ using System.Collections; -using libsecondlife; namespace OpenSim.Region.Capabilities { diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs index 8a18213..941e70e 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDVoiceAccountResponse.cs @@ -26,8 +26,6 @@ * */ -using libsecondlife; - namespace OpenSim.Region.Capabilities { [LLSDMap] diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 192c8e3..ee0d164 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs @@ -27,7 +27,9 @@ using System; using System.Collections.Generic; +using System.Reflection; using libsecondlife; +using log4net; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; @@ -36,7 +38,7 @@ namespace OpenSim.Framework.Communications { public class CommunicationsManager { - 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); protected IUserService m_userService; diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs index 5e7f855..90bda01 100644 --- a/OpenSim/Framework/Communications/IInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInventoryServices.cs @@ -26,9 +26,7 @@ */ using System.Collections.Generic; - using libsecondlife; - using OpenSim.Framework.Communications.Cache; namespace OpenSim.Framework.Communications diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index d4e7539..f614e7d 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs @@ -29,14 +29,14 @@ using System; using System.Collections.Generic; using System.Reflection; using libsecondlife; -using OpenSim.Framework.Console; +using log4net; namespace OpenSim.Framework.Communications { public abstract class InventoryServiceBase : IInventoryServices { - 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); protected Dictionary m_plugins = new Dictionary(); diff --git a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs index ded9ffc..6ec21d9 100644 --- a/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/IRequestLimitStrategy.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; - namespace OpenSim.Framework.Communications.Limit { /// diff --git a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs index 43b77a7..72d0586 100644 --- a/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/NullLimitStrategy.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; - namespace OpenSim.Framework.Communications.Limit { /// diff --git a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs index 85ff2bd..dfa05fa 100644 --- a/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/RepeatLimitStrategy.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; namespace OpenSim.Framework.Communications.Limit diff --git a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs index b2b4f14..34b01ff 100644 --- a/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs +++ b/OpenSim/Framework/Communications/Limit/TimeLimitStrategy.cs @@ -104,7 +104,7 @@ namespace OpenSim.Framework.Communications.Limit { if (!IsMonitoringRequests(id)) { - requests.Add(id, new Request(System.DateTime.Now)); + requests.Add(id, new Request(DateTime.Now)); } } diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index 1b88d10..a379253 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs @@ -28,10 +28,11 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Reflection; using libsecondlife; using libsecondlife.StructuredData; +using log4net; using Nwc.XmlRpc; -using OpenSim.Framework.Console; namespace OpenSim.Framework.UserManagement { @@ -41,7 +42,7 @@ namespace OpenSim.Framework.UserManagement /// public class LoginResponse { - 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 Hashtable loginFlagsHash; private Hashtable globalTexturesHash; diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index ce8aa23..d656559 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -29,21 +29,22 @@ using System; using System.Collections; using System.Collections.Generic; using System.IO; +using System.Reflection; using System.Text.RegularExpressions; using System.Threading; +using System.Web; using libsecondlife; using libsecondlife.StructuredData; +using log4net; using Nwc.XmlRpc; - using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Console; using OpenSim.Framework.Statistics; namespace OpenSim.Framework.UserManagement { public abstract class LoginService { - 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); protected string m_welcomeMessage = "Welcome to OpenSim"; protected UserManagerBase m_userManager = null; @@ -159,7 +160,7 @@ namespace OpenSim.Framework.UserManagement { webloginkey = new LLUUID((string)requestData["web_login_key"]); } - catch (System.Exception e) + catch (Exception e) { m_log.InfoFormat( "[LOGIN END]: Bad web_login_key: {0} for user {1} {2}, exception {3}", @@ -514,7 +515,7 @@ namespace OpenSim.Framework.UserManagement statuscode = 301; string redirectURL = "about:blank?redirect-http-hack=" + - System.Web.HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + + HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + lastname + "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); //m_log.Info("[WEB]: R:" + redirectURL); diff --git a/OpenSim/Framework/Communications/RestClient/RestClient.cs b/OpenSim/Framework/Communications/RestClient/RestClient.cs index 1178fed..5463134 100644 --- a/OpenSim/Framework/Communications/RestClient/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient/RestClient.cs @@ -29,10 +29,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Net; +using System.Reflection; using System.Text; using System.Threading; using System.Web; -using OpenSim.Framework.Console; +using log4net; namespace OpenSim.Framework.Communications { @@ -55,7 +56,7 @@ namespace OpenSim.Framework.Communications /// public class RestClient { - 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 realuri; diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index c86992a..0f7dc44 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -32,8 +32,8 @@ using System.Reflection; using System.Security.Cryptography; using libsecondlife; using libsecondlife.StructuredData; +using log4net; using Nwc.XmlRpc; -using OpenSim.Framework.Console; using OpenSim.Framework.Statistics; namespace OpenSim.Framework.UserManagement @@ -43,8 +43,8 @@ namespace OpenSim.Framework.UserManagement /// public abstract class UserManagerBase : IUserService { - 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); public UserConfig _config; private Dictionary _plugins = new Dictionary(); diff --git a/OpenSim/Framework/Communications/XMPP/Stanza.cs b/OpenSim/Framework/Communications/XMPP/Stanza.cs index 5675a47..3930bac 100644 --- a/OpenSim/Framework/Communications/XMPP/Stanza.cs +++ b/OpenSim/Framework/Communications/XMPP/Stanza.cs @@ -26,8 +26,6 @@ */ using System; -using System.Collections.Generic; -using System.Text; using System.Xml; namespace OpenSim.Framework.Communications.XMPP diff --git a/OpenSim/Framework/Communications/XMPP/XMPPParser.cs b/OpenSim/Framework/Communications/XMPP/XMPPParser.cs index e41df26..26a78b2 100644 --- a/OpenSim/Framework/Communications/XMPP/XMPPParser.cs +++ b/OpenSim/Framework/Communications/XMPP/XMPPParser.cs @@ -25,12 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections.Generic; -using System.Text; -using System.Xml; -using OpenSim.Framework; - namespace OpenSim.Framework.Communications.XMPP { public class XMPPParser diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs index 1fb4866..e985c06 100644 --- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs +++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs @@ -25,22 +25,24 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using System.IO; using System.Net; +using System.Reflection; using System.Text; -using OpenSim.Framework.Console; +using log4net; namespace OpenSim.Framework.Configuration.HTTP { public class HTTPConfiguration : IGenericConfig { - 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 RemoteConfigSettings remoteConfigSettings; private XmlConfiguration xmlConfig; - private string configFileName = System.String.Empty; + private string configFileName = String.Empty; public HTTPConfiguration() { diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs index 88945ff..4e37ec6 100644 --- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs +++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs @@ -25,13 +25,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; + namespace OpenSim.Framework.Configuration.HTTP { public class RemoteConfigSettings { private ConfigurationMember configMember; - public string baseConfigURL = System.String.Empty; + public string baseConfigURL = String.Empty; public RemoteConfigSettings(string filename) { diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs index c27a134..12590b4 100644 --- a/OpenSim/Framework/ConfigurationMember.cs +++ b/OpenSim/Framework/ConfigurationMember.cs @@ -32,13 +32,14 @@ using System.Net; using System.Reflection; using System.Xml; using libsecondlife; +using log4net; using OpenSim.Framework.Console; namespace OpenSim.Framework { public class ConfigurationMember { - 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); public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index ce95cb9..27ff340 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs @@ -28,14 +28,15 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.Net; +using System.Reflection; +using log4net; namespace OpenSim.Framework.Console { public class ConsoleBase { - 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 readonly object m_syncRoot = new object(); diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs index 542a03f..86df3c0 100644 --- a/OpenSim/Framework/Console/OpenSimAppender.cs +++ b/OpenSim/Framework/Console/OpenSimAppender.cs @@ -26,14 +26,9 @@ */ using System; -using System.Text; using System.Text.RegularExpressions; -using System.Globalization; - -using log4net.Core; -using log4net.Layout; using log4net.Appender; -using log4net.Util; +using log4net.Core; namespace OpenSim.Framework.Console { diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index 54baab9..66b0885 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs @@ -25,10 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections.Generic; -using System.Text; - namespace OpenSim.Framework { public class Constants diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 49b36e9..98052fc 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs @@ -27,14 +27,15 @@ using System; using System.IO; +using System.Reflection; using libsecondlife; -using OpenSim.Framework.Console; +using log4net; namespace OpenSim.Framework { public class EstateSettings { - 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); //Settings to this island private float m_billableFactor; diff --git a/OpenSim/Framework/FriendListItem.cs b/OpenSim/Framework/FriendListItem.cs index 5a66683..9220705 100644 --- a/OpenSim/Framework/FriendListItem.cs +++ b/OpenSim/Framework/FriendListItem.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections.Generic; using libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index 9519f17..7ccd0c4 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs @@ -26,7 +26,6 @@ */ using System; -using OpenSim.Framework.Console; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs index ef7abd1..77e5460 100644 --- a/OpenSim/Framework/GridInstantMessage.cs +++ b/OpenSim/Framework/GridInstantMessage.cs @@ -26,7 +26,6 @@ */ using System; -using OpenSim.Framework; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs index 5bbf435..23c0642 100644 --- a/OpenSim/Framework/IAssetServer.cs +++ b/OpenSim/Framework/IAssetServer.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections.Generic; using libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs index cfba135..6a500f8 100644 --- a/OpenSim/Framework/IInventoryData.cs +++ b/OpenSim/Framework/IInventoryData.cs @@ -25,9 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections; using System.Collections.Generic; -using System.Xml.Serialization; using libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs index abccf49..e5e8f62 100644 --- a/OpenSim/Framework/InventoryCollection.cs +++ b/OpenSim/Framework/InventoryCollection.cs @@ -25,9 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections; using System.Collections.Generic; -using System.Xml.Serialization; using libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs index 7136efa..39a6930 100644 --- a/OpenSim/Framework/InventoryConfig.cs +++ b/OpenSim/Framework/InventoryConfig.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using OpenSim.Framework.Console; +using System; namespace OpenSim.Framework { @@ -34,12 +34,12 @@ namespace OpenSim.Framework /// public class InventoryConfig { - public string DefaultStartupMsg = System.String.Empty; - public string UserServerURL = System.String.Empty; - public string UserSendKey = System.String.Empty; - public string UserRecvKey = System.String.Empty; + public string DefaultStartupMsg = String.Empty; + public string UserServerURL = String.Empty; + public string UserSendKey = String.Empty; + public string UserRecvKey = String.Empty; - public string DatabaseProvider = System.String.Empty; + public string DatabaseProvider = String.Empty; public static uint DefaultHttpPort = 8004; public uint HttpPort = DefaultHttpPort; diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs index ee53307..8e276e9 100644 --- a/OpenSim/Framework/InventoryFolderBase.cs +++ b/OpenSim/Framework/InventoryFolderBase.cs @@ -25,9 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections; -using System.Collections.Generic; -using System.Xml.Serialization; using libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index 03b47ca..8c8d858 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs @@ -25,9 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections; -using System.Collections.Generic; -using System.Xml.Serialization; using libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/JId.cs b/OpenSim/Framework/JId.cs index a685807..dac4838 100644 --- a/OpenSim/Framework/JId.cs +++ b/OpenSim/Framework/JId.cs @@ -26,8 +26,6 @@ */ using System; -using System.Collections.Generic; -using System.Text; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index f154e5e..6d2c5d7 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections.Generic; using System; +using System.Collections.Generic; using libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs index bc1e8d0..bc3375d 100644 --- a/OpenSim/Framework/Login.cs +++ b/OpenSim/Framework/Login.cs @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using libsecondlife; namespace OpenSim.Framework @@ -39,7 +40,7 @@ namespace OpenSim.Framework public LLUUID InventoryFolder; public LLUUID BaseFolder; public uint CircuitCode; - public string CapsPath = System.String.Empty; + public string CapsPath = String.Empty; public LLVector3 StartPos; public Login() diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs index f15efa6..dbc06db 100644 --- a/OpenSim/Framework/MessageServerConfig.cs +++ b/OpenSim/Framework/MessageServerConfig.cs @@ -26,9 +26,6 @@ */ using System; -using System.Collections.Generic; -using System.Text; -using OpenSim.Framework.Console; namespace OpenSim.Framework { @@ -69,7 +66,7 @@ namespace OpenSim.Framework configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", - "http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort.ToString() + "/", false); + "http://127.0.0.1:" + DefaultHttpPort.ToString() + "/", false); configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index df559fc..ee11924 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using Nini.Config; using System; +using Nini.Config; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs index 31548a0..22f952a 100644 --- a/OpenSim/Framework/PacketPool.cs +++ b/OpenSim/Framework/PacketPool.cs @@ -26,8 +26,9 @@ */ using System; -using System.Net; using System.Collections; +using System.Net; +using libsecondlife; using libsecondlife.Packets; namespace OpenSim.Framework @@ -115,13 +116,13 @@ namespace OpenSim.Framework { byte[] decoded_header = new byte[10 + 8]; ushort id; - libsecondlife.PacketFrequency freq; + PacketFrequency freq; Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10); - if((bytes[0] & libsecondlife.Helpers.MSG_ZEROCODED)!=0) + if((bytes[0] & Helpers.MSG_ZEROCODED)!=0) { - libsecondlife.Helpers.ZeroDecodeCommand(bytes, decoded_header); + Helpers.ZeroDecodeCommand(bytes, decoded_header); } if (decoded_header[6] == 0xFF) @@ -129,18 +130,18 @@ namespace OpenSim.Framework if (decoded_header[7] == 0xFF) { id = (ushort)((decoded_header[8] << 8) + decoded_header[9]); - freq = libsecondlife.PacketFrequency.Low; + freq = PacketFrequency.Low; } else { id = (ushort)decoded_header[7]; - freq = libsecondlife.PacketFrequency.Medium; + freq = PacketFrequency.Medium; } } else { id = (ushort)decoded_header[6]; - freq = libsecondlife.PacketFrequency.High; + freq = PacketFrequency.High; } return Packet.GetType(id, freq); diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index ee2079b..73971ac 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Collections.Generic; using System; +using System.Collections.Generic; using libsecondlife; namespace OpenSim.Framework diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index f19f1db..20a2709 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -31,7 +31,6 @@ using System.Net.Sockets; using System.Xml; using libsecondlife; using Nini.Config; -using OpenSim.Framework.Console; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs index ad8b4a0..cfaaf02 100644 --- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs +++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs @@ -25,6 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using System.IO; using Nini.Config; @@ -48,7 +49,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"]; regionConfigPath = startupConfig.GetString("regionload_regionsdir", regionConfigPath).Trim(); } - catch (System.Exception) + catch (Exception) { // No INI setting recorded. } diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs index 098e305..17077e7 100644 --- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs +++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs @@ -25,17 +25,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using System.IO; using System.Net; +using System.Reflection; using System.Xml; +using log4net; using Nini.Config; -using OpenSim.Framework.Console; namespace OpenSim.Framework.RegionLoader.Web { public class RegionLoaderWebServer : IRegionLoader { - 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 IniConfigSource m_configSouce; @@ -54,8 +56,8 @@ namespace OpenSim.Framework.RegionLoader.Web else { IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; - string url = startupConfig.GetString("regionload_webserver_url", System.String.Empty).Trim(); - if (url == System.String.Empty) + string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim(); + if (url == String.Empty) { m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty."); return null; @@ -68,7 +70,7 @@ namespace OpenSim.Framework.RegionLoader.Web HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server..."); StreamReader reader = new StreamReader(webResponse.GetResponseStream()); - string xmlSource = System.String.Empty; + string xmlSource = String.Empty; string tempStr = reader.ReadLine(); while (tempStr != null) { diff --git a/OpenSim/Framework/RegionUpData.cs b/OpenSim/Framework/RegionUpData.cs index c2a7763..6162171 100644 --- a/OpenSim/Framework/RegionUpData.cs +++ b/OpenSim/Framework/RegionUpData.cs @@ -26,8 +26,6 @@ */ using System; -using System.Collections.Generic; -using System.Text; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/SerializableInventory.cs b/OpenSim/Framework/SerializableInventory.cs index 529f91e..8193fa7 100644 --- a/OpenSim/Framework/SerializableInventory.cs +++ b/OpenSim/Framework/SerializableInventory.cs @@ -26,9 +26,7 @@ */ using System.Collections; -using System.Collections.Generic; using System.Xml.Serialization; -using libsecondlife; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 00c81c8..7c268ed 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -30,18 +30,20 @@ using System.Collections; using System.Collections.Generic; using System.IO; using System.Net; +using System.Net.Sockets; +using System.Reflection; using System.Text; using System.Threading; using System.Xml; -using Nwc.XmlRpc; using libsecondlife.StructuredData; -using OpenSim.Framework.Console; +using log4net; +using Nwc.XmlRpc; namespace OpenSim.Framework.Servers { public class BaseHttpServer { - 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); protected Thread m_workerThread; protected HttpListener m_httpListener; @@ -199,7 +201,7 @@ namespace OpenSim.Framework.Servers } } } - catch (System.Net.Sockets.SocketException e) + catch (SocketException e) { // At least on linux, it appears that if the client makes a request without requiring the response, // an unconnected socket exception is thrown when we close the response output stream. There's no @@ -346,7 +348,7 @@ namespace OpenSim.Framework.Servers { response.OutputStream.Close(); } - catch (System.Net.Sockets.SocketException) + catch (SocketException) { // This has to be here to prevent a Linux/Mono crash } @@ -602,7 +604,7 @@ namespace OpenSim.Framework.Servers m_workerThread.Name = "HttpThread"; m_workerThread.IsBackground = true; m_workerThread.Start(); - OpenSim.Framework.ThreadTracker.Add(m_workerThread); + ThreadTracker.Add(m_workerThread); } private void StartHTTP() diff --git a/OpenSim/Framework/Servers/GenericHTTPMethod.cs b/OpenSim/Framework/Servers/GenericHTTPMethod.cs index f6bd65b..1358a00 100644 --- a/OpenSim/Framework/Servers/GenericHTTPMethod.cs +++ b/OpenSim/Framework/Servers/GenericHTTPMethod.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/MessageServerInfo.cs b/OpenSim/Framework/Servers/MessageServerInfo.cs index 9bcd4e1..17b5f10 100644 --- a/OpenSim/Framework/Servers/MessageServerInfo.cs +++ b/OpenSim/Framework/Servers/MessageServerInfo.cs @@ -25,9 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; -using System.Text; namespace OpenSim.Framework.Servers { diff --git a/OpenSim/Framework/Statistics/AssetStatsReporter.cs b/OpenSim/Framework/Statistics/AssetStatsReporter.cs index 00422a8..66eb471 100644 --- a/OpenSim/Framework/Statistics/AssetStatsReporter.cs +++ b/OpenSim/Framework/Statistics/AssetStatsReporter.cs @@ -26,7 +26,6 @@ */ using System; -using System.Text; using System.Timers; namespace OpenSim.Framework.Statistics diff --git a/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs b/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs index bef509d..0d85919 100644 --- a/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs +++ b/OpenSim/Framework/Statistics/Interfaces/IPullStatsProvider.cs @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; - namespace OpenSim.Framework.Statistics.Interfaces { /// diff --git a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs index 167b771..567d8dd 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs +++ b/OpenSim/Framework/Statistics/SimExtraStatsReporter.cs @@ -28,11 +28,8 @@ using System; using System.Collections.Generic; using System.Text; - -using OpenSim.Framework; -using OpenSim.Framework.Statistics.Interfaces; - using libsecondlife; +using OpenSim.Framework.Statistics.Interfaces; namespace OpenSim.Framework.Statistics { diff --git a/OpenSim/Framework/Statistics/UserStatsReporter.cs b/OpenSim/Framework/Statistics/UserStatsReporter.cs index e7c9bce..ce82615 100644 --- a/OpenSim/Framework/Statistics/UserStatsReporter.cs +++ b/OpenSim/Framework/Statistics/UserStatsReporter.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System.Text; using System.Timers; namespace OpenSim.Framework.Statistics diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 36228b5..1cf2e58 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs @@ -25,13 +25,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +using System; using System.Collections.Generic; +using System.Reflection; using System.Xml; using System.Xml.Schema; using System.Xml.Serialization; - using libsecondlife; -using System; +using log4net; namespace OpenSim.Framework { @@ -43,7 +44,7 @@ namespace OpenSim.Framework public class TaskInventoryDictionary : Dictionary, ICloneable, IXmlSerializable { - 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 static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem)); diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs index b71a0e1..8fe5b82 100644 --- a/OpenSim/Framework/ThreadTracker.cs +++ b/OpenSim/Framework/ThreadTracker.cs @@ -28,7 +28,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Text; using System.Threading; namespace OpenSim.Framework @@ -36,7 +35,7 @@ namespace OpenSim.Framework public static class ThreadTracker { public static List m_Threads; - public static System.Threading.Thread ThreadTrackerThread; + public static Thread ThreadTrackerThread; private static readonly long ThreadTimeout = 30 * 10000000; static ThreadTracker() @@ -46,7 +45,7 @@ namespace OpenSim.Framework ThreadTrackerThread = new Thread(ThreadTrackerThreadLoop); ThreadTrackerThread.Name = "ThreadTrackerThread"; ThreadTrackerThread.IsBackground = true; - ThreadTrackerThread.Priority = System.Threading.ThreadPriority.BelowNormal; + ThreadTrackerThread.Priority = ThreadPriority.BelowNormal; ThreadTrackerThread.Start(); #endif } @@ -60,7 +59,7 @@ namespace OpenSim.Framework } } - public static void Add(System.Threading.Thread thread) + public static void Add(Thread thread) { #if DEBUG lock (m_Threads) @@ -73,7 +72,7 @@ namespace OpenSim.Framework #endif } - public static void Remove(System.Threading.Thread thread) + public static void Remove(Thread thread) { #if DEBUG lock (m_Threads) @@ -126,7 +125,7 @@ namespace OpenSim.Framework public class ThreadTrackerItem { - public System.Threading.Thread Thread; + public Thread Thread; public long LastSeenActive; } } diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 8335bba..8ae8f7e 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs @@ -26,7 +26,6 @@ */ using System; -using OpenSim.Framework.Console; namespace OpenSim.Framework { diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index ac1145f..2396519 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -26,24 +26,26 @@ */ using System; -using System.Collections.Generic; using System.Data; using System.IO; using System.Net; using System.Net.Sockets; +using System.Reflection; +using System.Runtime.Serialization; +using System.Runtime.Serialization.Formatters.Binary; using System.Security.Cryptography; using System.Text; +using System.Text.RegularExpressions; using libsecondlife; +using log4net; using Nini.Config; using Nwc.XmlRpc; -using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; namespace OpenSim.Framework { public class Util { - 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 static Random randomClass = new Random(); private static uint nextXferID = 5000; @@ -385,7 +387,7 @@ namespace OpenSim.Framework /// safe path public static string safePath(string path) { - return System.Text.RegularExpressions.Regex.Replace(path, @regexInvalidPathChars, string.Empty); + return Regex.Replace(path, @regexInvalidPathChars, string.Empty); } /// @@ -395,7 +397,7 @@ namespace OpenSim.Framework /// safe filename public static string safeFileName(string filename) { - return System.Text.RegularExpressions.Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ; + return Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ; } // @@ -520,7 +522,7 @@ namespace OpenSim.Framework sr.Close(); return issue; } - catch (System.Exception) + catch (Exception) { return ""; } -- cgit v1.1