aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorDiva Canto2010-05-03 09:50:55 -0700
committerDiva Canto2010-05-03 09:50:55 -0700
commitb10811a13b8fab81ce00d544d8efe081792bdaaa (patch)
treed91da884fa1f43a11067f7adda2f398d3b9bf77a /OpenSim/Server/Handlers
parentFix a bug in owner change notification (diff)
downloadopensim-SC_OLD-b10811a13b8fab81ce00d544d8efe081792bdaaa.zip
opensim-SC_OLD-b10811a13b8fab81ce00d544d8efe081792bdaaa.tar.gz
opensim-SC_OLD-b10811a13b8fab81ce00d544d8efe081792bdaaa.tar.bz2
opensim-SC_OLD-b10811a13b8fab81ce00d544d8efe081792bdaaa.tar.xz
Assorted bug fixes in hypergrid linking.
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs1
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs3
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
70 server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false); 70 server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false);
71 71
72 server.AddHTTPHandler("/foreignagent/", new GatekeeperAgentHandler(m_GatekeeperService).Handler); 72 server.AddHTTPHandler("/foreignagent/", new GatekeeperAgentHandler(m_GatekeeperService).Handler);
73
74 } 73 }
75 74
76 public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server) 75 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
48 public HypergridHandlers(IGatekeeperService gatekeeper) 48 public HypergridHandlers(IGatekeeperService gatekeeper)
49 { 49 {
50 m_GatekeeperService = gatekeeper; 50 m_GatekeeperService = gatekeeper;
51 m_log.DebugFormat("[HYPERGRID HANDLERS]: Active");
51 } 52 }
52 53
53 /// <summary> 54 /// <summary>
@@ -61,6 +62,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
61 //string host = (string)requestData["host"]; 62 //string host = (string)requestData["host"];
62 //string portstr = (string)requestData["port"]; 63 //string portstr = (string)requestData["port"];
63 string name = (string)requestData["region_name"]; 64 string name = (string)requestData["region_name"];
65 if (name == null)
66 name = string.Empty;
64 67
65 UUID regionID = UUID.Zero; 68 UUID regionID = UUID.Zero;
66 string externalName = string.Empty; 69 string externalName = string.Empty;