2 files changed, 36 insertions, 26 deletions

diff --git a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
index 4e8fb00..b662c4e 100644
--- a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
+++ b/src/RemoteServers/RemoteGridServers/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-remoteservers")]

-[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]

-[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-remoteservers")]
+[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
+[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
+
diff --git a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
index 17b6440..4f5d3a9 100644
--- a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
+++ b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
@@ -69,6 +69,11 @@ namespace RemoteGridServers
         {

                 private string GridServerUrl;

                 private string GridSendKey;

+                private string GridRecvKey;

+                private string UserServerUrl;

+                private string UserSendKey;

+                private string UserRecvKey;

+

                 private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>(); 

 

                 public override Dictionary<uint, agentcircuitdata> agentcircuits {

@@ -132,15 +137,20 @@ namespace RemoteGridServers
                         return(uuidBlock);

                 }

                 

-                public override void RequestNeighbours()

+                public override neighbourinfo[] RequestNeighbours()

                 {

-                        return;

+                        neighbourinfo[] neighbours= new neighbourinfo[8];

+                        return neighbours;

                 }

                 

-                public override void SetServerInfo(string ServerUrl, string ServerKey)

+                public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerKey, string GridSendKey, string GridRecvKey)

                 {

-                        this.GridServerUrl = ServerUrl;

-                        this.GridSendKey = ServerKey;

+                        this.UserServerUrl = UserServerUrl;

+                        this.UserSendKey = UserSendKey;

+                        this.UserRecvKey = UserRecvKey;

+                        this.GridServerUrl = GridServerUrl;

+                        this.GridSendKey = GridSendKey;

+                        this.GridRecvKey = GridRecvKey;

                 }

                 

                 public override string GetName()