1 files changed, 30 insertions, 7 deletions
diff --git a/src/GridInterfaces/IGridServer.cs b/src/GridInterfaces/IGridServer.cs
index c2d7172..7a43399 100644
--- a/src/GridInterfaces/IGridServer.cs
+++ b/src/GridInterfaces/IGridServer.cs
@@ -46,18 +46,41 @@ namespace OpenSim.GridServers
        
        public interface IGridServer
        {
-                bool RequestConnection();
-                Dictionary<uint, agentcircuitdata> agentcircuits {
-                        get;
-                        set;
-                }
                UUIDBlock RequestUUIDBlock();
                void 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();
                void SetServerInfo(string ServerUrl, string ServerKey);
-                void AddNewSession(Login session); // only used by local version of grid server 
+         }
-                                                                                   // and didn't use to be part of this interface until we put this in a dll
+        
+        public abstract class RemoteGridBase : IGridServer
+        {
+                public abstract Dictionary<uint, agentcircuitdata> agentcircuits {
+                        get;
+                        set;
+                }
+                
+                public abstract UUIDBlock RequestUUIDBlock();
+                public abstract void 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();
+                public abstract void SetServerInfo(string ServerUrl, string ServerKey);
+        }
+        
+        public abstract class LocalGridBase : IGridServer
+        {
+                public abstract UUIDBlock RequestUUIDBlock();
+                public abstract void 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();
+                public abstract void SetServerInfo(string ServerUrl, string ServerKey);
+                public abstract void AddNewSession(Login session);
        }
        
        public struct UUIDBlock

diff --git a/src/GridInterfaces/IGridServer.cs b/src/GridInterfaces/IGridServer.cs index c2d7172..7a43399 100644 --- a/src/GridInterfaces/IGridServer.cs +++ b/src/GridInterfaces/IGridServer.cs
@@ -46,18 +46,41 @@ namespace OpenSim.GridServers
46		46
47	public interface IGridServer	47	public interface IGridServer
48	{	48	{
49	bool RequestConnection();
50	Dictionary<uint, agentcircuitdata> agentcircuits {
51	get;
52	set;
53	}
54	UUIDBlock RequestUUIDBlock();	49	UUIDBlock RequestUUIDBlock();
55	void RequestNeighbours(); //should return a array of neighbouring regions	50	void RequestNeighbours(); //should return a array of neighbouring regions
56	AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);	51	AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
57	bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);	52	bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
		53	string GetName();
		54	bool RequestConnection();
58	void SetServerInfo(string ServerUrl, string ServerKey);	55	void SetServerInfo(string ServerUrl, string ServerKey);
59	void AddNewSession(Login session); // only used by local version of grid server	56	}
60	// and didn't use to be part of this interface until we put this in a dll	57
		58	public abstract class RemoteGridBase : IGridServer
		59	{
		60	public abstract Dictionary<uint, agentcircuitdata> agentcircuits {
		61	get;
		62	set;
		63	}
		64
		65	public abstract UUIDBlock RequestUUIDBlock();
		66	public abstract void RequestNeighbours();
		67	public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
		68	public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
		69	public abstract string GetName();
		70	public abstract bool RequestConnection();
		71	public abstract void SetServerInfo(string ServerUrl, string ServerKey);
		72	}
		73
		74	public abstract class LocalGridBase : IGridServer
		75	{
		76	public abstract UUIDBlock RequestUUIDBlock();
		77	public abstract void RequestNeighbours();
		78	public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
		79	public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
		80	public abstract string GetName();
		81	public abstract bool RequestConnection();
		82	public abstract void SetServerInfo(string ServerUrl, string ServerKey);
		83	public abstract void AddNewSession(Login session);
61	}	84	}
62		85
63	public struct UUIDBlock	86	public struct UUIDBlock