ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Excelsior!

Browse Source
This commit is contained in:
Adam Frisby
2007-07-14 22:35:47 +00:00
parent a04f968f8c
commit 2ccb8f7118
5 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Grid/GridServer/GridManager.cs
View File

@@ -659,12 +659,18 @@ namespace OpenSim.Grid.GridServer
TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
bool requirePublic = false;
bool requireValid = true;
if (requirePublic && (TheSim.serverIP.StartsWith("172.16") || TheSim.serverIP.StartsWith("192.168") || TheSim.serverIP.StartsWith("10.") || TheSim.serverIP.StartsWith("0.") || TheSim.serverIP.StartsWith("255.")))
{
return "ERROR! Servers must register with public addresses.";
}
if (requireValid && (TheSim.serverIP.StartsWith("0.")))
{
return "ERROR! 0.*.*.* Addresses are invalid, please check your server config and try again";
}
try
{

6
OpenSim/Grid/UserServer/UserManager.cs
View File

@@ -30,6 +30,7 @@ using System.Collections;
using Nwc.XmlRpc;
using OpenSim.Framework.Data;
using OpenSim.Framework.UserManagement;
using OpenSim.Framework.Utilities;
namespace OpenSim.Grid.UserServer
{
@@ -63,6 +64,10 @@ namespace OpenSim.Grid.UserServer
response.RegionX = SimInfo.regionLocX;
response.RegionY = SimInfo.regionLocX;
//Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI
string capsPath = Util.GetRandomCapsPath();
response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
// Notify the target of an incoming user
Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI+ ")");
@@ -78,6 +83,7 @@ namespace OpenSim.Grid.UserServer
SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();
SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();
SimParams["caps_path"] = capsPath;
ArrayList SendParams = new ArrayList();
SendParams.Add(SimParams);