aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs6
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs6
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs7
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
5 files changed, 22 insertions, 1 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 7ad10fb..ab7f277 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -545,7 +545,7 @@ namespace OpenSim.Framework.Data.MySQL
545 { 545 {
546 string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; 546 string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
547 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; 547 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
548 sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, ?serverHttpPort, ?serverRemotingPort) VALUES "; 548 sql += "regionAssetSendKey, regionUserURI, regionUserRecvKey, regionUserSendKey, regionMapTexture, serverHttpPort, serverRemotingPort) VALUES ";
549 549
550 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, "; 550 sql += "(?regionHandle, ?regionName, ?uuid, ?regionRecvKey, ?regionSecret, ?regionSendKey, ?regionDataURI, ";
551 sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, "; 551 sql += "?serverIP, ?serverPort, ?serverURI, ?locX, ?locY, ?locZ, ?eastOverrideHandle, ?westOverrideHandle, ?southOverrideHandle, ?northOverrideHandle, ?regionAssetURI, ?regionAssetRecvKey, ";
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
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 4384906..acf09eb 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -229,9 +229,16 @@ namespace OpenSim
229 UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword); 229 UserProfileData masterAvatar = commsManager.UserServer.SetupMasterUser(LocalWorld.RegionInfo.MasterAvatarFirstName, LocalWorld.RegionInfo.MasterAvatarLastName, LocalWorld.RegionInfo.MasterAvatarSandboxPassword);
230 if (masterAvatar != null) 230 if (masterAvatar != null)
231 { 231 {
232 m_log.Notice("Parcels - Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");
232 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID; 233 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.UUID;
233 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager); 234 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
234 } 235 }
236 else
237 {
238 m_log.Notice("Parcels - No master avatar found, using null.");
239 LocalWorld.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
240 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.ParcelManager);
241 }
235 242
236 LocalWorld.StartTimer(); 243 LocalWorld.StartTimer();
237 } 244 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index d32976f..2a73538 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -265,6 +265,8 @@ namespace OpenSim.Region.Communications.OGS1
265 agentData.lastname = (string)requestData["lastname"]; 265 agentData.lastname = (string)requestData["lastname"];
266 agentData.AgentID = new LLUUID((string)requestData["agent_id"]); 266 agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
267 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); 267 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
268 agentData.CapsPath = (string)requestData["caps_path"];
269
268 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1")) 270 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
269 { 271 {
270 agentData.child = true; 272 agentData.child = true;