diff options
author | Melanie | 2010-05-04 18:39:04 +0100 |
---|---|---|
committer | Melanie | 2010-05-04 18:39:04 +0100 |
commit | 585259ef08cc0431a479a2ac361129bf7f0e1317 (patch) | |
tree | 24ce5501226ed90777089dde76b2387a058f6be5 /OpenSim/Server | |
parent | Add events to the estate interface to let interested modules know of (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-585259ef08cc0431a479a2ac361129bf7f0e1317.zip opensim-SC-585259ef08cc0431a479a2ac361129bf7f0e1317.tar.gz opensim-SC-585259ef08cc0431a479a2ac361129bf7f0e1317.tar.bz2 opensim-SC-585259ef08cc0431a479a2ac361129bf7f0e1317.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs | 1 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs | 3 |
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; |