From e06ffb3981d29ddb3383690b4a05dc684813b6d9 Mon Sep 17 00:00:00 2001 From: mingchen Date: Tue, 3 Jul 2007 17:03:14 +0000 Subject: *Removed GridInfo class as it has been previously replaced with the much better NetworkServersInfo class *Got the GridServer in OGS1 to go through with registering the region, but the actual storage of the region isnt working right now. **After this is fixed, grid mode should work! --- OpenSim/Framework/Communications/IGridServices.cs | 9 ++------- OpenSim/Framework/General/Types/NetworkServersInfo.cs | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs index c168c20..c296209 100644 --- a/OpenSim/Framework/Communications/IGridServices.cs +++ b/OpenSim/Framework/Communications/IGridServices.cs @@ -31,16 +31,11 @@ using OpenSim.Framework.Types; namespace OpenSim.Framework.Communications { - public class GridInfo - { - public string GridServerURI = "http://grid.deepgrid.com:8001/"; // Temporarily hardcoded. - public string GridServerSendKey = "badger"; - public string GridServerRecvKey = "badger"; - } + public interface IGridServices { - RegionCommsListener RegisterRegion(RegionInfo regionInfo, GridInfo gridInfo); + RegionCommsListener RegisterRegion(RegionInfo regionInfos); List RequestNeighbours(RegionInfo regionInfo); RegionInfo RequestNeighbourInfo(ulong regionHandle); List RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY); diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index 89ebf94..142edc0 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs @@ -121,7 +121,7 @@ namespace OpenSim.Framework.Types attri = configData.GetAttribute("GridServerURL"); if (attri == "") { - this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/"); + this.GridURL = MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:13801/"); configData.SetAttribute("GridServerURL", this.GridURL); } else -- cgit v1.1