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/LocalServers/LocalGridServers/LocalGrid.cs | 29 +++++++++++++-------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'src/LocalServers')

diff --git a/src/LocalServers/LocalGridServers/LocalGrid.cs b/src/LocalServers/LocalGridServers/LocalGrid.cs
index 86a68d5..32ed113 100644
--- a/src/LocalServers/LocalGridServers/LocalGrid.cs
+++ b/src/LocalServers/LocalGridServers/LocalGrid.cs
@@ -110,28 +110,26 @@ namespace LocalGridServers
 		}
 	}
 	
-	public class LocalGridServer :IGridServer
+	public class LocalGridServer : LocalGridBase
 	{
 		public List<Login> Sessions = new List<Login>();  
 	
-		private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>();
-
-                public Dictionary<uint, agentcircuitdata> agentcircuits {
-                        get {return agentcircuits;}
-                        set {agentcircuits=value;}
-                }
-	
 		public LocalGridServer()
 		{
 			Sessions = new List<Login>();
 			ServerConsole.MainConsole.Instance.WriteLine("Local Grid Server class created");
 		}
 		
-		public bool RequestConnection()
+		public override string GetName()
+		{
+			return "Local";
+		}
+		
+		public override bool RequestConnection()
 		{
 			return true;
 		}
-		public AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
+		public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
 		{
 			//we are running local
 			AuthenticateResponse user = new AuthenticateResponse();
@@ -151,31 +149,32 @@ namespace LocalGridServers
 			return(user);
 		}
 		
-		public bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
+		public override bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
 		{
 			return(true);
 		}
 		
-		public UUIDBlock RequestUUIDBlock()
+		public override UUIDBlock RequestUUIDBlock()
 		{
 			UUIDBlock uuidBlock = new UUIDBlock();
 			return(uuidBlock);
 		}
 		
-		public void RequestNeighbours()
+		public override void RequestNeighbours()
 		{
 			return;
 		}
 		
-		public void SetServerInfo(string ServerUrl, string ServerKey)
+		public override void SetServerInfo(string ServerUrl, string ServerKey)
 		{
 			
 		}
+		
 		/// <summary>
 		/// used by the local login server to inform us of new sessions
 		/// </summary>
 		/// <param name="session"></param>
-		public void AddNewSession(Login session)
+		public override void AddNewSession(Login session)
 		{
 			lock(this.Sessions)
 			{
-- 
cgit v1.1