aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/RemoteServers/RemoteGridServers
diff options
context:
space:
mode:
authorgareth2007-03-18 20:18:52 +0000
committergareth2007-03-18 20:18:52 +0000
commit99c56acf746516068562fd42ab286668413894e8 (patch)
tree6bd5141f0db0cf44d8fbaf4855f65fe3de414695 /src/RemoteServers/RemoteGridServers
parentAdded neighbourinfo class (diff)
downloadopensim-SC_OLD-99c56acf746516068562fd42ab286668413894e8.zip
opensim-SC_OLD-99c56acf746516068562fd42ab286668413894e8.tar.gz
opensim-SC_OLD-99c56acf746516068562fd42ab286668413894e8.tar.bz2
opensim-SC_OLD-99c56acf746516068562fd42ab286668413894e8.tar.xz
Added some sanity
Diffstat (limited to 'src/RemoteServers/RemoteGridServers')
-rw-r--r--src/RemoteServers/RemoteGridServers/AssemblyInfo.cs42
-rw-r--r--src/RemoteServers/RemoteGridServers/RemoteGrid.cs20
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 @@
1using System; 1using System;
2using System.Reflection; 2using System.Reflection;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5//------------------------------------------------------------------------------ 5// ------------------------------------------------------------------------------
6// <auto-generated> 6// <autogenerated>
7// This code was generated by a tool. 7// This code was generated by a tool.
8// Runtime Version:2.0.50727.42 8// Mono Runtime Version: 2.0.50727.42
9// 9//
10// Changes to this file may cause incorrect behavior and will be lost if 10// Changes to this file may cause incorrect behavior and will be lost if
11// the code is regenerated. 11// the code is regenerated.
12// </auto-generated> 12// </autogenerated>
13//------------------------------------------------------------------------------ 13// ------------------------------------------------------------------------------
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.0.0.1")] 17[assembly: AssemblyVersionAttribute("0.1.*.236")]
18[assembly: AssemblyTitleAttribute("opensim-remoteservers")] 18[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")] 19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
21 21
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
69 { 69 {
70 private string GridServerUrl; 70 private string GridServerUrl;
71 private string GridSendKey; 71 private string GridSendKey;
72 private string GridRecvKey;
73 private string UserServerUrl;
74 private string UserSendKey;
75 private string UserRecvKey;
76
72 private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>(); 77 private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>();
73 78
74 public override Dictionary<uint, agentcircuitdata> agentcircuits { 79 public override Dictionary<uint, agentcircuitdata> agentcircuits {
@@ -132,15 +137,20 @@ namespace RemoteGridServers
132 return(uuidBlock); 137 return(uuidBlock);
133 } 138 }
134 139
135 public override void RequestNeighbours() 140 public override neighbourinfo[] RequestNeighbours()
136 { 141 {
137 return; 142 neighbourinfo[] neighbours= new neighbourinfo[8];
143 return neighbours;
138 } 144 }
139 145
140 public override void SetServerInfo(string ServerUrl, string ServerKey) 146 public override void SetServerInfo(string UserServerUrl, string UserSendKey, string UserRecvKey, string GridServerKey, string GridSendKey, string GridRecvKey)
141 { 147 {
142 this.GridServerUrl = ServerUrl; 148 this.UserServerUrl = UserServerUrl;
143 this.GridSendKey = ServerKey; 149 this.UserSendKey = UserSendKey;
150 this.UserRecvKey = UserRecvKey;
151 this.GridServerUrl = GridServerUrl;
152 this.GridSendKey = GridSendKey;
153 this.GridRecvKey = GridRecvKey;
144 } 154 }
145 155
146 public override string GetName() 156 public override string GetName()