aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs3
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
2 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index eef6ed4..103c76f 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -121,11 +121,10 @@ namespace OpenSim.Region.Communications.Local
121 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 121 theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
122 string capsPath = Util.GetRandomCapsPath(); 122 string capsPath = Util.GetRandomCapsPath();
123 response.SimAddress = reg.ExternalEndPoint.Address.ToString(); 123 response.SimAddress = reg.ExternalEndPoint.Address.ToString();
124 response.SimPort = (Int32) reg.ExternalEndPoint.Port; 124 response.SimPort = (uint) reg.ExternalEndPoint.Port;
125 response.RegionX = reg.RegionLocX; 125 response.RegionX = reg.RegionLocX;
126 response.RegionY = reg.RegionLocY; 126 response.RegionY = reg.RegionLocY;
127 127
128
129 response.SeedCapability = "http://" + reg.ExternalHostName + ":" + 128 response.SeedCapability = "http://" + reg.ExternalHostName + ":" +
130 serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; 129 serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/";
131 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; 130 // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/";
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index b11a91f..353dc28 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
166 { 166 {
167 string simIp = (string) neighbourData["sim_ip"]; 167 string simIp = (string) neighbourData["sim_ip"];
168 168
169 int port = Convert.ToInt32(neighbourData["sim_port"]); 169 uint port = Convert.ToUInt32(neighbourData["sim_port"]);
170 string externalUri = (string) neighbourData["sim_uri"]; 170 string externalUri = (string) neighbourData["sim_uri"];
171 171
172 string externalIpStr = Util.GetHostFromDNS(simIp).ToString(); 172 string externalIpStr = Util.GetHostFromDNS(simIp).ToString();
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Communications.OGS1
450 /// </summary> 450 /// </summary>
451 private void StartRemoting() 451 private void StartRemoting()
452 { 452 {
453 TcpChannel ch = new TcpChannel(NetworkServersInfo.RemotingListenerPort); 453 TcpChannel ch = new TcpChannel((int) NetworkServersInfo.RemotingListenerPort);
454 ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this. 454 ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this.
455 455
456 WellKnownServiceTypeEntry wellType = 456 WellKnownServiceTypeEntry wellType =
@@ -559,7 +559,7 @@ namespace OpenSim.Region.Communications.OGS1
559 // it's own remoting port! How special. 559 // it's own remoting port! How special.
560 region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); 560 region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle));
561 region.RemotingAddress = region.ExternalHostName; 561 region.RemotingAddress = region.ExternalHostName;
562 region.RemotingPort = (uint) NetworkServersInfo.RemotingListenerPort; 562 region.RemotingPort = NetworkServersInfo.RemotingListenerPort;
563 if (m_localBackend.RegionUp(region,regionhandle)) 563 if (m_localBackend.RegionUp(region,regionhandle))
564 { 564 {
565 return true; 565 return true;