aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorAdam Frisby2007-07-14 22:35:47 +0000
committerAdam Frisby2007-07-14 22:35:47 +0000
commit2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e (patch)
tree0855803d694abaad00b87c3ab7766dd16dff69ee /OpenSim/Grid
parent* libterrain now builds again (diff)
downloadopensim-SC_OLD-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.zip
opensim-SC_OLD-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.gz
opensim-SC_OLD-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.bz2
opensim-SC_OLD-2ccb8f71183b0a50bbabc9252656a39cc3c0ba8e.tar.xz
* Excelsior!
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs6
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs6
2 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index d2cb6c2..64b51b4 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -659,12 +659,18 @@ namespace OpenSim.Grid.GridServer
659 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; 659 TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
660 660
661 bool requirePublic = false; 661 bool requirePublic = false;
662 bool requireValid = true;
662 663
663 if (requirePublic && (TheSim.serverIP.StartsWith("172.16") || TheSim.serverIP.StartsWith("192.168") || TheSim.serverIP.StartsWith("10.") || TheSim.serverIP.StartsWith("0.") || TheSim.serverIP.StartsWith("255."))) 664 if (requirePublic && (TheSim.serverIP.StartsWith("172.16") || TheSim.serverIP.StartsWith("192.168") || TheSim.serverIP.StartsWith("10.") || TheSim.serverIP.StartsWith("0.") || TheSim.serverIP.StartsWith("255.")))
664 { 665 {
665 return "ERROR! Servers must register with public addresses."; 666 return "ERROR! Servers must register with public addresses.";
666 } 667 }
667 668
669 if (requireValid && (TheSim.serverIP.StartsWith("0.")))
670 {
671 return "ERROR! 0.*.*.* Addresses are invalid, please check your server config and try again";
672 }
673
668 674
669 try 675 try
670 { 676 {
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 6fae0a8..ca0cdc3 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -30,6 +30,7 @@ using System.Collections;
30using Nwc.XmlRpc; 30using Nwc.XmlRpc;
31using OpenSim.Framework.Data; 31using OpenSim.Framework.Data;
32using OpenSim.Framework.UserManagement; 32using OpenSim.Framework.UserManagement;
33using OpenSim.Framework.Utilities;
33 34
34namespace OpenSim.Grid.UserServer 35namespace OpenSim.Grid.UserServer
35{ 36{
@@ -63,6 +64,10 @@ namespace OpenSim.Grid.UserServer
63 response.RegionX = SimInfo.regionLocX; 64 response.RegionX = SimInfo.regionLocX;
64 response.RegionY = SimInfo.regionLocX; 65 response.RegionY = SimInfo.regionLocX;
65 66
67 //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI
68 string capsPath = Util.GetRandomCapsPath();
69 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
70
66 // Notify the target of an incoming user 71 // Notify the target of an incoming user
67 Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI+ ")"); 72 Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI+ ")");
68 73
@@ -78,6 +83,7 @@ namespace OpenSim.Grid.UserServer
78 SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString(); 83 SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
79 SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString(); 84 SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();
80 SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString(); 85 SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();
86 SimParams["caps_path"] = capsPath;
81 ArrayList SendParams = new ArrayList(); 87 ArrayList SendParams = new ArrayList();
82 SendParams.Add(SimParams); 88 SendParams.Add(SimParams);
83 89