aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
diff options
context:
space:
mode:
authorMW2007-04-25 13:03:48 +0000
committerMW2007-04-25 13:03:48 +0000
commitf7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 (patch)
treeb9f8f1dac346906f1333aa3fc8da704466eda005 /OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
parent* Added try{}catch{} to RunTerrainCmd (diff)
downloadopensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.zip
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.gz
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.bz2
opensim-SC_OLD-f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0.tar.xz
Small clean up of files and directories
Diffstat (limited to '')
-rw-r--r--OpenSim.GridInterfaces/Remote/RemoteGridServer.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index 7cd68df..a475471 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
@@ -34,7 +34,7 @@ using System.IO;
34using libsecondlife; 34using libsecondlife;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Assets; 37using OpenSim.Framework.Types;
38 38
39namespace OpenSim.GridInterfaces.Remote 39namespace OpenSim.GridInterfaces.Remote
40{ 40{
@@ -44,28 +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(); 47 private ArrayList simneighbours = new ArrayList();
48 private Hashtable griddatahash; 48 private Hashtable griddatahash;
49 49
50 public override Dictionary<uint, AgentCircuitData> agentcircuits 50 public override Dictionary<uint, AgentCircuitData> agentcircuits
51 { 51 {
52 get { return AgentCircuits; } 52 get { return AgentCircuits; }
53 set { AgentCircuits = value; } 53 set { AgentCircuits = value; }
54 } 54 }
55 55
56 public override ArrayList neighbours 56 public override ArrayList neighbours
57 { 57 {
58 get { return simneighbours; } 58 get { return simneighbours; }
59 set { simneighbours = value; } 59 set { simneighbours = value; }
60 } 60 }
61 61
62 public override Hashtable GridData 62 public override Hashtable GridData
63 { 63 {
64 get { return griddatahash; } 64 get { return griddatahash; }
65 set { griddatahash = value; } 65 set { griddatahash = value; }
66 } 66 }
67 67
68 68
69 public RemoteGridServer() 69 public RemoteGridServer()
70 { 70 {
71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); 71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created");
@@ -84,15 +84,15 @@ namespace OpenSim.GridInterfaces.Remote
84 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams); 84 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
85 XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000); 85 XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);
86 Hashtable GridRespData = (Hashtable)GridResp.Value; 86 Hashtable GridRespData = (Hashtable)GridResp.Value;
87 this.griddatahash=GridRespData; 87 this.griddatahash=GridRespData;
88 88
89 if(GridRespData.ContainsKey("error")) { 89 if(GridRespData.ContainsKey("error")) {
90 string errorstring = (string)GridRespData["error"]; 90 string errorstring = (string)GridRespData["error"];
91 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:"); 91 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:");
92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring); 92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring);
93 return false; 93 return false;
94 } 94 }
95 this.neighbours = (ArrayList)GridRespData["neighbours"]; 95 this.neighbours = (ArrayList)GridRespData["neighbours"];
96 Console.WriteLine(simneighbours.Count); 96 Console.WriteLine(simneighbours.Count);
97 return true; 97 return true;
98 } 98 }