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/Communications/Capabilities/Caps.cs | 9 ++++----- OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs | 6 ------ .../Communications/Capabilities/LLSDAssetUploadComplete.cs | 2 +- .../Communications/Capabilities/LLSDAssetUploadRequest.cs | 9 +++++---- .../Communications/Capabilities/LLSDAssetUploadResponse.cs | 6 ++++-- .../Framework/Communications/Capabilities/LLSDInventoryItem.cs | 3 --- .../Communications/Capabilities/LLSDParcelVoiceInfoResponse.cs | 1 - .../Communications/Capabilities/LLSDVoiceAccountResponse.cs | 2 -- 8 files changed, 14 insertions(+), 24 deletions(-) (limited to 'OpenSim/Framework/Communications/Capabilities') 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] -- cgit v1.1