7 files changed, 23 insertions, 175 deletions

diff --git a/Common/OpenSim.Framework/Interfaces/LocalGridBase.cs b/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
index 4b5fa77..462e2c5 100644
--- a/Common/OpenSim.Framework/Interfaces/LocalGridBase.cs
+++ b/Common/OpenSim.Framework/Interfaces/AuthenticateResponse.cs
@@ -26,26 +26,26 @@
 * 

 */

 using System;

+using System.Collections;

 using System.Collections.Generic;

-using System.Text;

+using System.Net;

+using System.Net.Sockets;

+using System.IO;

 using libsecondlife;

+using OpenSim;

 using OpenSim.Framework.Types;

-using System.Collections;

 

 namespace OpenSim.Framework.Interfaces

 {

-    public abstract class LocalGridBase : IGridServer

+    public class AuthenticateResponse

     {

-        public abstract UUIDBlock RequestUUIDBlock();

-        public abstract NeighbourInfo[] RequestNeighbours();

-        public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);

-        public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);

-        public abstract string GetName();

-        public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);

-        public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

-        public abstract void AddNewSession(Login session);

-        public abstract IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);

-        public abstract void Close();

-    }

+        public bool Authorised;

+        public Login LoginInfo;

 

+        public AuthenticateResponse()

+        {

+

+        }

+

+    }

 }

diff --git a/Common/OpenSim.Framework/Interfaces/IGridServer.cs b/Common/OpenSim.Framework/Interfaces/IGridServer.cs
deleted file mode 100644
index 06bcb8a..0000000
--- a/Common/OpenSim.Framework/Interfaces/IGridServer.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections;

-using System.Collections.Generic;

-using System.Net;

-using System.Net.Sockets;

-using System.IO;

-using libsecondlife;

-using OpenSim;

-using OpenSim.Framework.Types;

-

-namespace OpenSim.Framework.Interfaces

-{

-    /// <summary>

-    /// Handles connection to Grid Servers.

-    /// also Sim to Sim connections?

-    /// </summary>

-

-    public interface IGridServer

-    {

-        UUIDBlock RequestUUIDBlock();

-        NeighbourInfo[] RequestNeighbours(); //should return a array of neighbouring regions

-        AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);

-        bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);

-        string GetName();

-        bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);

-        void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

-        IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);

-        void Close();

-    }

-    

-    public struct UUIDBlock

-    {

-        public LLUUID BlockStart;

-        public LLUUID BlockEnd;

-    }

-

-    public class AuthenticateResponse

-    {

-        public bool Authorised;

-        public Login LoginInfo;

-

-        public AuthenticateResponse()

-        {

-

-        }

-

-    }

-

-    public interface IGridPlugin

-    {

-        IGridServer GetGridServer();

-    }

-}

diff --git a/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs b/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs
deleted file mode 100644
index a5d043f..0000000
--- a/Common/OpenSim.Framework/Interfaces/RemoteGridBase.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* 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.Types;

-

-namespace OpenSim.Framework.Interfaces

-{

-    public abstract class RemoteGridBase : IGridServer

-    {

-        public abstract Dictionary<uint, AgentCircuitData> agentcircuits

-        {

-            get;

-            set;

-        }

-

-        public abstract UUIDBlock RequestUUIDBlock();

-        public abstract NeighbourInfo[] RequestNeighbours();

-        public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);

-        public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);

-        public abstract string GetName();

-        public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);

-        public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);

-        public abstract IList RequestMapBlocks(int minX, int minY, int maxX, int maxY);

-        public abstract void Close();

-        public abstract Hashtable GridData {

-                get;

-                set;

-        }

-

-        public abstract ArrayList neighbours {

-                get;

-                set;

-        }

-    }

-}

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 3c0d66e..4939b59 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -126,13 +126,13 @@
     <Compile Include="Util.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IAssetServer.cs">

+    <Compile Include="Interfaces\AuthenticateResponse.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IClientAPI.cs">

+    <Compile Include="Interfaces\IAssetServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\IGridServer.cs">

+    <Compile Include="Interfaces\IClientAPI.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Interfaces\ILocalStorage.cs">

@@ -144,12 +144,6 @@
     <Compile Include="Interfaces\IWorld.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Interfaces\LocalGridBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="Interfaces\RemoteGridBase.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="Interfaces\Config\IGenericConfig.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index c50bdec..65a58dc 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -23,14 +23,12 @@
                 <include name="UserProfileManager.cs" />

                 <include name="UserProfileManagerBase.cs" />

                 <include name="Util.cs" />

+                <include name="Interfaces/AuthenticateResponse.cs" />

                 <include name="Interfaces/IAssetServer.cs" />

                 <include name="Interfaces/IClientAPI.cs" />

-                <include name="Interfaces/IGridServer.cs" />

                 <include name="Interfaces/ILocalStorage.cs" />

                 <include name="Interfaces/IUserServer.cs" />

                 <include name="Interfaces/IWorld.cs" />

-                <include name="Interfaces/LocalGridBase.cs" />

-                <include name="Interfaces/RemoteGridBase.cs" />

                 <include name="Interfaces/Config/IGenericConfig.cs" />

                 <include name="Interfaces/Config/IGridConfig.cs" />

                 <include name="Interfaces/Config/IUserConfig.cs" />

diff --git a/Common/OpenSim.Servers/LocalUserProfileManager.cs b/Common/OpenSim.Servers/LocalUserProfileManager.cs
index 4f327a7..773de5a 100644
--- a/Common/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/Common/OpenSim.Servers/LocalUserProfileManager.cs
@@ -41,16 +41,16 @@ namespace OpenSim.UserServer
 {

     public class LocalUserProfileManager : UserProfileManager 

     {

-        private IGridServer m_gridServer;

+       // private IGridServer m_gridServer;

         private int m_port;

         private string m_ipAddr;

         private uint regionX;

         private uint regionY;

         private AddNewSessionHandler AddSession;

 

-        public LocalUserProfileManager(IGridServer gridServer, int simPort, string ipAddr , uint regX, uint regY)

+        public LocalUserProfileManager( int simPort, string ipAddr , uint regX, uint regY)

                 {

-                        m_gridServer = gridServer;

+                        

             m_port = simPort;

             m_ipAddr = ipAddr;

             regionX = regX;

diff --git a/Common/OpenSim.Servers/LoginServer.cs b/Common/OpenSim.Servers/LoginServer.cs
index c63eb28..1243147 100644
--- a/Common/OpenSim.Servers/LoginServer.cs
+++ b/Common/OpenSim.Servers/LoginServer.cs
@@ -53,7 +53,7 @@ namespace OpenSim.UserServer
     /// </summary>

     public class LoginServer : LoginService, IUserServer

     {

-        private IGridServer m_gridServer;

+       //private IGridServer m_gridServer;

         public IPAddress clientAddress = IPAddress.Loopback;

         public IPAddress remoteAddress = IPAddress.Any;

         private int NumClients;

@@ -96,7 +96,7 @@ namespace OpenSim.UserServer
 

             this._mpasswd = EncodePassword("testpass");

 

-            userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr, regionX, regionY);

+            userManager = new LocalUserProfileManager( m_simPort, m_simAddr, regionX, regionY);

             //userManager.InitUserProfiles();

             userManager.SetKeys("", "", "", "Welcome to OpenSim");

         }