From f7b51d63a87a6703d7cb8f376d1f3f7ec6ede8a0 Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 25 Apr 2007 13:03:48 +0000 Subject: Small clean up of files and directories --- OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs | 2 +- OpenSim.GridInterfaces/Remote/RemoteGridServer.cs | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'OpenSim.GridInterfaces/Remote') diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs index 71fca57..d2f8de1 100644 --- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs +++ b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs @@ -7,7 +7,7 @@ using System.Net.Sockets; using System.IO; using libsecondlife; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Assets; +using OpenSim.Framework.Types; using OpenSim.Framework.Utilities; namespace OpenSim.GridInterfaces.Remote 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; using libsecondlife; using Nwc.XmlRpc; using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Assets; +using OpenSim.Framework.Types; namespace OpenSim.GridInterfaces.Remote { @@ -44,28 +44,28 @@ namespace OpenSim.GridInterfaces.Remote private string GridSendKey; private string GridRecvKey; private Dictionary AgentCircuits = new Dictionary(); - private ArrayList simneighbours = new ArrayList(); - private Hashtable griddatahash; + private ArrayList simneighbours = new ArrayList(); + private Hashtable griddatahash; public override Dictionary 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"); @@ -84,15 +84,15 @@ 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; + 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"]; + } + this.neighbours = (ArrayList)GridRespData["neighbours"]; Console.WriteLine(simneighbours.Count); return true; } -- cgit v1.1