aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.GridInterfaces
diff options
context:
space:
mode:
authorgareth2007-04-15 02:31:34 +0000
committergareth2007-04-15 02:31:34 +0000
commitf9b7cc53deb93fc3528929385d3f76519083c927 (patch)
treeae3fbc308febed796772525be7d9a55e4ce24b8e /OpenSim.GridInterfaces
parentIn the grid, there is life! (diff)
downloadopensim-SC_OLD-f9b7cc53deb93fc3528929385d3f76519083c927.zip
opensim-SC_OLD-f9b7cc53deb93fc3528929385d3f76519083c927.tar.gz
opensim-SC_OLD-f9b7cc53deb93fc3528929385d3f76519083c927.tar.bz2
opensim-SC_OLD-f9b7cc53deb93fc3528929385d3f76519083c927.tar.xz
W00t! multiple sims!
Misc bugfixes Child agents!!!!!! General sexy stuff
Diffstat (limited to '')
-rw-r--r--OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs2
-rw-r--r--OpenSim.GridInterfaces/Remote/RemoteGridServer.cs22
2 files changed, 21 insertions, 3 deletions
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 528e9fa..71fca57 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
@@ -65,7 +65,7 @@ namespace OpenSim.GridInterfaces.Remote
65 //we need to add support for the asset server not knowing about a requested asset 65 //we need to add support for the asset server not knowing about a requested asset
66 ARequest req = this._assetRequests.Dequeue(); 66 ARequest req = this._assetRequests.Dequeue();
67 LLUUID assetID = req.AssetID; 67 LLUUID assetID = req.AssetID;
68 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it"); 68 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data");
69 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data"); 69 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data");
70 WebResponse AssetResponse = AssetLoad.GetResponse(); 70 WebResponse AssetResponse = AssetLoad.GetResponse();
71 byte[] idata = new byte[(int)AssetResponse.ContentLength]; 71 byte[] idata = new byte[(int)AssetResponse.ContentLength];
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