Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/World/Region/RestartModule.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

3 files changed, 39 insertions, 31 deletions

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index daebf8b..a1485c8 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.GridService
                 {
                     MainConsole.Instance.Commands.AddCommand("Regions", true,
                             "deregister region id",
-                            "deregister region id <Region UUID>",
+                            "deregister region id <region-id>+",
                             "Deregister a region manually.",
                             String.Empty,
                             HandleDeregisterRegion);
@@ -526,40 +526,41 @@ namespace OpenSim.Services.GridService
 
         private void HandleDeregisterRegion(string module, string[] cmd)
         {
-            if (cmd.Length != 4)
+            if (cmd.Length < 4)
             {
-                MainConsole.Instance.Output("Syntax: degregister region id <Region UUID>");
+                MainConsole.Instance.Output("Usage: degregister region id <region-id>+");
                 return;
             }
 
-            string rawRegionUuid = cmd[3];
-            UUID regionUuid;
-
-            if (!UUID.TryParse(rawRegionUuid, out regionUuid))
+            for (int i = 3; i < cmd.Length; i++)
             {
-                MainConsole.Instance.OutputFormat("{0} is not a valid region uuid", rawRegionUuid);
-                return;
-            }
+                string rawRegionUuid = cmd[i];
+                UUID regionUuid;
 
-            GridRegion region = GetRegionByUUID(UUID.Zero, regionUuid);
+                if (!UUID.TryParse(rawRegionUuid, out regionUuid))
+                {
+                    MainConsole.Instance.OutputFormat("{0} is not a valid region uuid", rawRegionUuid);
+                    return;
+                }
 
-            if (region == null)
-            {
-                MainConsole.Instance.OutputFormat("No region with UUID {0}", regionUuid);
-                return;
-            }
+                GridRegion region = GetRegionByUUID(UUID.Zero, regionUuid);
 
-            if (DeregisterRegion(regionUuid))
-            {
-                MainConsole.Instance.OutputFormat("Deregistered {0} {1}", region.RegionName, regionUuid);
-            }
-            else
-            {
-                // I don't think this can ever occur if we know that the region exists.
-                MainConsole.Instance.OutputFormat("Error deregistering {0} {1}", region.RegionName, regionUuid);
-            }
+                if (region == null)
+                {
+                    MainConsole.Instance.OutputFormat("No region with UUID {0}", regionUuid);
+                    return;
+                }
 
-            return;
+                if (DeregisterRegion(regionUuid))
+                {
+                    MainConsole.Instance.OutputFormat("Deregistered {0} {1}", region.RegionName, regionUuid);
+                }
+                else
+                {
+                    // I don't think this can ever occur if we know that the region exists.
+                    MainConsole.Instance.OutputFormat("Error deregistering {0} {1}", region.RegionName, regionUuid);
+                }
+            }
         }
 
         private void HandleShowRegions(string module, string[] cmd)
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 0a3e70b..e10c4cb 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -326,7 +326,7 @@ namespace OpenSim.Services.HypergridService
                 return false;
             }
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: User is OK");
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: User {0} is ok", aCircuit.Name);
 
             bool isFirstLogin = false;
             //
@@ -345,7 +345,8 @@ namespace OpenSim.Services.HypergridService
                         aCircuit.firstname, aCircuit.lastname);
                     return false;
                 }
-                m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence ok");
+
+                m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence {0} is ok", aCircuit.Name);
 
                 // Also login foreigners with GridUser service
                 if (m_GridUserService != null && account == null)
@@ -376,7 +377,9 @@ namespace OpenSim.Services.HypergridService
                 reason = "Destination region not found";
                 return false;
             }
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: destination ok: {0}", destination.RegionName);
+
+            m_log.DebugFormat(
+                "[GATEKEEPER SERVICE]: Destination {0} is ok for {1}", destination.RegionName, aCircuit.Name);
 
             //
             // Adjust the visible name
@@ -410,7 +413,8 @@ namespace OpenSim.Services.HypergridService
             // Preserve our TeleportFlags we have gathered so-far
             loginFlag |= (Constants.TeleportFlags) aCircuit.teleportFlags;
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: launching agent {0}", loginFlag);
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
+
             return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
         }
 
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 3f4c958..cecbe9e 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -137,7 +137,10 @@ namespace OpenSim.Services.Interfaces
                 if ( m_serverURI != string.Empty ) {
                     return m_serverURI;
                 } else {
-                    return "http://" + m_externalHostName + ":" + m_httpPort + "/";
+                    if (m_httpPort == 0)
+                        return "http://" + m_externalHostName + "/";
+                    else
+                        return "http://" + m_externalHostName + ":" + m_httpPort + "/";
                 }
             }
             set {