31 files changed, 28 insertions, 75 deletions

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