From 8d1e9f83f338de21482547816834f4535cebf5bc Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 15 Mar 2007 10:14:12 +0000
Subject: Cleaned up IGridServer interfaces. Added a try/catch around the http
 server Startup

---
 src/GridInterfaces/IGridServer.cs | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

(limited to 'src/GridInterfaces')

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
-- 
cgit v1.1