*Fixed 2 small references to localhost which has some conflicts when resolving.

*Grid mode now gets past region handshake, BUT the client (both nicholas and the normal one) crash as soon as the next step is displayed on the screen

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 4602dcf..e6bc82a 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Framework.Types
                 int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections");

                 m_internalEndPoint = new IPEndPoint(internalAddress, internalPort);

 

-                m_externalHostName = GetString(configData, "ExternalHostName", "localhost", "External Host Name");

+                m_externalHostName = GetString(configData, "ExternalHostName", "127.0.0.1", "External Host Name");

 

                 estateSettings.terrainFile =

                     GetString(configData, "TerrainFile", "default.r32", "GENERAL SETTING: Default Terrain File");                

diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index ad70df8..4567d7e 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -51,7 +51,7 @@ namespace SimpleApp
             NetworkServersInfo serverInfo = new NetworkServersInfo();

             CommunicationsLocal communicationsManager = new CommunicationsLocal(serverInfo);

 

-            RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "localhost" );

+            RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "127.0.0.1" );

 

             BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port );

             MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);