aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-07-06 13:57:49 +0000
committermingchen2007-07-06 13:57:49 +0000
commit93640f1d71115dea680639c4564dcf89ecab4b61 (patch)
treeac9f676e7c983ac4d6d849578f6284ab733b113f
parent*Fixed crash of OpenSim client when in grid mode from a recent commit (diff)
downloadopensim-SC_OLD-93640f1d71115dea680639c4564dcf89ecab4b61.zip
opensim-SC_OLD-93640f1d71115dea680639c4564dcf89ecab4b61.tar.gz
opensim-SC_OLD-93640f1d71115dea680639c4564dcf89ecab4b61.tar.bz2
opensim-SC_OLD-93640f1d71115dea680639c4564dcf89ecab4b61.tar.xz
*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
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
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
199 int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections"); 199 int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections");
200 m_internalEndPoint = new IPEndPoint(internalAddress, internalPort); 200 m_internalEndPoint = new IPEndPoint(internalAddress, internalPort);
201 201
202 m_externalHostName = GetString(configData, "ExternalHostName", "localhost", "External Host Name"); 202 m_externalHostName = GetString(configData, "ExternalHostName", "127.0.0.1", "External Host Name");
203 203
204 estateSettings.terrainFile = 204 estateSettings.terrainFile =
205 GetString(configData, "TerrainFile", "default.r32", "GENERAL SETTING: Default Terrain File"); 205 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
51 NetworkServersInfo serverInfo = new NetworkServersInfo(); 51 NetworkServersInfo serverInfo = new NetworkServersInfo();
52 CommunicationsLocal communicationsManager = new CommunicationsLocal(serverInfo); 52 CommunicationsLocal communicationsManager = new CommunicationsLocal(serverInfo);
53 53
54 RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "localhost" ); 54 RegionInfo regionInfo = new RegionInfo( 1000, 1000, internalEndPoint, "127.0.0.1" );
55 55
56 BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port ); 56 BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port );
57 MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer); 57 MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);