W00t! multiple sims!

Misc bugfixes
Child agents!!!!!!
General sexy stuff

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
                 //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];

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
         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;

         }