Merge branch 'master' into careminster-presence-refactor

2 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index f2d9321..dcb2725 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -70,7 +70,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
             server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false);
 
             server.AddHTTPHandler("/foreignagent/", new GatekeeperAgentHandler(m_GatekeeperService).Handler);
-
         }
 
         public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server)
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
index 0b65245..5d03097 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
         public HypergridHandlers(IGatekeeperService gatekeeper)
         {
             m_GatekeeperService = gatekeeper;
+            m_log.DebugFormat("[HYPERGRID HANDLERS]: Active");
         }
 
         /// <summary>
@@ -61,6 +62,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
             //string host = (string)requestData["host"];
             //string portstr = (string)requestData["port"];
             string name = (string)requestData["region_name"];
+            if (name == null)
+                name = string.Empty;
 
             UUID regionID = UUID.Zero;
             string externalName = string.Empty;