From 99c56acf746516068562fd42ab286668413894e8 Mon Sep 17 00:00:00 2001
From: gareth
Date: Sun, 18 Mar 2007 20:18:52 +0000
Subject: Added some sanity

---
 src/GridInterfaces/AssemblyInfo.cs | 42 +++++++++++++++++++-------------------
 src/GridInterfaces/IGridServer.cs  | 12 +++++------
 2 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'src/GridInterfaces')

diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
index 0ff408f..186934a 100644
--- a/src/GridInterfaces/AssemblyInfo.cs
+++ b/src/GridInterfaces/AssemblyInfo.cs
@@ -1,21 +1,21 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: ComVisibleAttribute(false)]
-[assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.0.0.1")]
-[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
-[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
-[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
-
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// ------------------------------------------------------------------------------
+//  <autogenerated>
+//      This code was generated by a tool.
+//      Mono Runtime Version: 2.0.50727.42
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if 
+//      the code is regenerated.
+//  </autogenerated>
+// ------------------------------------------------------------------------------
+
+[assembly: ComVisibleAttribute(false)]
+[assembly: CLSCompliantAttribute(false)]
+[assembly: AssemblyVersionAttribute("0.1.*.236")]
+[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
+[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/GridInterfaces/IGridServer.cs b/src/GridInterfaces/IGridServer.cs
index 51f5054..8ab0971 100644
--- a/src/GridInterfaces/IGridServer.cs
+++ b/src/GridInterfaces/IGridServer.cs
@@ -47,12 +47,12 @@ namespace OpenSim.GridServers
 	public interface IGridServer
 	{
 		UUIDBlock RequestUUIDBlock();
-		void RequestNeighbours(); //should return a array of neighbouring regions
+		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();
-		void SetServerInfo(string ServerUrl, string ServerKey);
+		void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
 	 }
 	
 	public abstract class RemoteGridBase : IGridServer
@@ -63,23 +63,23 @@ namespace OpenSim.GridServers
 		}
 		
 		public abstract UUIDBlock RequestUUIDBlock();
-		public abstract void RequestNeighbours(); 
+		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();
-		public abstract void SetServerInfo(string ServerUrl, string ServerKey);
+		public abstract void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
 	}
 	
 	public abstract class LocalGridBase : IGridServer
 	{
 		public abstract UUIDBlock RequestUUIDBlock();
-		public abstract void RequestNeighbours(); 
+		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();
-		public abstract void SetServerInfo(string ServerUrl, string ServerKey);
+		public abstract void SetServerInfo(string GridServerUrl, string GridSendKey, string GridRecvKey, string UserServerUrl, string UserSendKey, string UserRecvKey);
 		public abstract void AddNewSession(Login session);
 	}
 	
-- 
cgit v1.1