9 files changed, 26 insertions, 54 deletions

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 7c7c389..5d6ede8 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -25,15 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

-using System.Collections;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-using OpenSim.Framework;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

 using OpenSim.Framework.Communications;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Communications.Local

 {

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 26834be..43bdd03 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -25,13 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 * 

 */

-using System;

 using System.Collections.Generic;

-using System.Text;

 using libsecondlife;

-using OpenSim.Framework.Types;

 using OpenSim.Framework;

 using OpenSim.Framework.Communications;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Communications.Local

 {

@@ -163,7 +161,7 @@ namespace OpenSim.Region.Communications.Local
         /// <param name="agentID"></param>

         /// <param name="position"></param>

         /// <returns></returns>

-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)

         {

             if (this.regionHosts.ContainsKey(regionHandle))

             {

diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index b441a8d..592b36c 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -1,17 +1,11 @@
 using System;

-using System.Collections;

-using System.Collections.Generic;

-using System.Text;

-

+using libsecondlife;

 using OpenSim.Framework.Communications;

-//using OpenSim.Framework.User;

-using OpenSim.Framework.UserManagement;

 using OpenSim.Framework.Data;

 using OpenSim.Framework.Types;

+using OpenSim.Framework.UserManagement;

 using OpenSim.Framework.Utilities;

 

-using libsecondlife;

-

 namespace OpenSim.Region.Communications.Local

 {

     public class LocalUserServices : UserManagerBase, IUserServices

diff --git a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
index 1eb7107..9afb75e 100644
--- a/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/Local/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;

-using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

-

 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 870f577..0a0847e 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -1,8 +1,6 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework.Types;

 using OpenSim.Framework.Communications;

+using OpenSim.Framework.Types;

+

 namespace OpenSim.Region.Communications.OGS1

 {

     public class CommunicationsOGS1 : CommunicationsManager

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 977b131..1706c6d 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -1,19 +1,17 @@
 using System;

-using System.Collections.Generic;

 using System.Collections;

-using System.Text;

+using System.Collections.Generic;

+using System.Net;

 using System.Runtime.Remoting;

 using System.Runtime.Remoting.Channels;

 using System.Runtime.Remoting.Channels.Tcp;

-

-using OpenSim.Framework.Servers;

+using libsecondlife;

+using Nwc.XmlRpc;

 using OpenSim.Framework;

-using OpenSim.Framework.Types;

 using OpenSim.Framework.Communications;

-

-using Nwc.XmlRpc;

-using libsecondlife;

-using System.Net;

+using OpenSim.Framework.Console;

+using OpenSim.Framework.Servers;

+using OpenSim.Framework.Types;

 

 namespace OpenSim.Region.Communications.OGS1

 {

@@ -52,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
             if (GridRespData.ContainsKey("error"))

             {

                 string errorstring = (string)GridRespData["error"];

-                OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);

+                MainLog.Instance.Error("Unable to connect to grid: " + errorstring);

                 return null;

             }  

 

@@ -103,7 +101,7 @@ namespace OpenSim.Region.Communications.OGS1
 

         public RegionInfo RequestNeighbourInfo(ulong regionHandle)

         {

-            OpenSim.Framework.Console.MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");

+            MainLog.Instance.Warn("Unimplemented - RequestNeighbourInfo()");

             return null;

         }

 

@@ -184,7 +182,7 @@ namespace OpenSim.Region.Communications.OGS1
             }

             else

             {

-                OpenSim.Framework.Console.MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());

+                MainLog.Instance.Error("ExpectUser() - Unknown region " + ((ulong)requestData["regionhandle"]).ToString());

             }

 

             return new XmlRpcResponse();

@@ -215,7 +213,7 @@ namespace OpenSim.Region.Communications.OGS1
             return false;

         }

 

-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)

         {

             if (this.listeners.ContainsKey(regionHandle))

             {

@@ -239,7 +237,7 @@ namespace OpenSim.Region.Communications.OGS1
             return false;

         }

 

-        public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position)

         {

             if (this.listeners.ContainsKey(regionHandle))

             {

diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 51b33e9..f514a29 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -1,12 +1,11 @@
 using System;

-using System.Collections.Generic;

-using System.Text;

+using libsecondlife;

 using OpenSim.Framework.Types;

-using OpenSim.Framework.Communications;

+

 namespace OpenSim.Region.Communications.OGS1

 {

     public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);

-    public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);

+    public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position);

 

     public sealed class InterRegionSingleton

     {

@@ -40,7 +39,7 @@ namespace OpenSim.Region.Communications.OGS1
             return false;

         }

 

-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)

         {

             if (OnArrival != null)

             {

@@ -62,7 +61,7 @@ namespace OpenSim.Region.Communications.OGS1
             return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);

         }

 

-        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)

+        public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position)

         {

             return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);

         }

diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 6d428d0..7c7db03 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -1,13 +1,9 @@
 using System;

 using System.Collections;

-using System.Collections.Generic;

-using System.Text;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Communications;

-using OpenSim.Framework.Data;

 using libsecondlife;

-

 using Nwc.XmlRpc;

+using OpenSim.Framework.Communications;

+using OpenSim.Framework.Data;

 

 namespace OpenSim.Region.Communications.OGS1

 {

diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 0c6f965..41f811a 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
@@ -1,7 +1,5 @@
 using System.Reflection;

-using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

-

 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.