ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

W00t! multiple sims!

Browse Source 
Misc bugfixes
Child agents!!!!!!
General sexy stuff
This commit is contained in:
gareth
2007-04-15 02:31:34 +00:00
parent ba7aeb1479
commit f9b7cc53de
9 changed files with 129 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
View File

@@ -65,7 +65,7 @@ namespace OpenSim.GridInterfaces.Remote
//we need to add support for the asset server not knowing about a requested asset
ARequest req = this._assetRequests.Dequeue();
LLUUID assetID = req.AssetID;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data");
WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "getasset/" + AssetSendKey + "/" + assetID + "/data");
WebResponse AssetResponse = AssetLoad.GetResponse();
byte[] idata = new byte[(int)AssetResponse.ContentLength];

22
OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
View File

@@ -44,13 +44,28 @@ namespace OpenSim.GridInterfaces.Remote
private string GridSendKey;
private string GridRecvKey;
private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
private ArrayList simneighbours = new ArrayList();
private Hashtable griddatahash;
public override Dictionary<uint, AgentCircuitData> agentcircuits
{
get { return AgentCircuits; }
set { AgentCircuits = value; }
}
public override ArrayList neighbours
{
get { return simneighbours; }
set { simneighbours = value; }
}
public override Hashtable GridData
{
get { return griddatahash; }
set { griddatahash = value; }
}
public RemoteGridServer()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created");
@@ -69,13 +84,16 @@ namespace OpenSim.GridInterfaces.Remote
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);
Hashtable GridRespData = (Hashtable)GridResp.Value;
this.griddatahash=GridRespData;
if(GridRespData.ContainsKey("error")) {
string errorstring = (string)GridRespData["error"];
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring);
return false;
}
}
this.neighbours = (ArrayList)GridRespData["neighbours"];
Console.WriteLine(simneighbours.Count);
return true;
}