diff options
author | gareth | 2007-04-15 02:31:34 +0000 |
---|---|---|
committer | gareth | 2007-04-15 02:31:34 +0000 |
commit | f9b7cc53deb93fc3528929385d3f76519083c927 (patch) | |
tree | ae3fbc308febed796772525be7d9a55e4ce24b8e /OpenSim.GridInterfaces/Remote/RemoteGridServer.cs | |
parent | In the grid, there is life! (diff) | |
download | opensim-SC-f9b7cc53deb93fc3528929385d3f76519083c927.zip opensim-SC-f9b7cc53deb93fc3528929385d3f76519083c927.tar.gz opensim-SC-f9b7cc53deb93fc3528929385d3f76519083c927.tar.bz2 opensim-SC-f9b7cc53deb93fc3528929385d3f76519083c927.tar.xz |
W00t! multiple sims!
Misc bugfixes
Child agents!!!!!!
General sexy stuff
Diffstat (limited to 'OpenSim.GridInterfaces/Remote/RemoteGridServer.cs')
-rw-r--r-- | OpenSim.GridInterfaces/Remote/RemoteGridServer.cs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs index d51d212..7cd68df 100644 --- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs +++ b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs | |||
@@ -44,13 +44,28 @@ namespace OpenSim.GridInterfaces.Remote | |||
44 | private string GridSendKey; | 44 | private string GridSendKey; |
45 | private string GridRecvKey; | 45 | private string GridRecvKey; |
46 | private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>(); | 46 | private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>(); |
47 | private ArrayList simneighbours = new ArrayList(); | ||
48 | private Hashtable griddatahash; | ||
47 | 49 | ||
48 | public override Dictionary<uint, AgentCircuitData> agentcircuits | 50 | public override Dictionary<uint, AgentCircuitData> agentcircuits |
49 | { | 51 | { |
50 | get { return AgentCircuits; } | 52 | get { return AgentCircuits; } |
51 | set { AgentCircuits = value; } | 53 | set { AgentCircuits = value; } |
52 | } | 54 | } |
55 | |||
56 | public override ArrayList neighbours | ||
57 | { | ||
58 | get { return simneighbours; } | ||
59 | set { simneighbours = value; } | ||
60 | } | ||
53 | 61 | ||
62 | public override Hashtable GridData | ||
63 | { | ||
64 | get { return griddatahash; } | ||
65 | set { griddatahash = value; } | ||
66 | } | ||
67 | |||
68 | |||
54 | public RemoteGridServer() | 69 | public RemoteGridServer() |
55 | { | 70 | { |
56 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); | 71 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); |
@@ -69,13 +84,16 @@ namespace OpenSim.GridInterfaces.Remote | |||
69 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); | 84 | XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); |
70 | XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000); | 85 | XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000); |
71 | Hashtable GridRespData = (Hashtable)GridResp.Value; | 86 | Hashtable GridRespData = (Hashtable)GridResp.Value; |
72 | 87 | this.griddatahash=GridRespData; | |
88 | |||
73 | if(GridRespData.ContainsKey("error")) { | 89 | if(GridRespData.ContainsKey("error")) { |
74 | string errorstring = (string)GridRespData["error"]; | 90 | string errorstring = (string)GridRespData["error"]; |
75 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:"); | 91 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:"); |
76 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring); | 92 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring); |
77 | return false; | 93 | return false; |
78 | } | 94 | } |
95 | this.neighbours = (ArrayList)GridRespData["neighbours"]; | ||
96 | Console.WriteLine(simneighbours.Count); | ||
79 | return true; | 97 | return true; |
80 | } | 98 | } |
81 | 99 | ||