diff options
author | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
commit | 8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch) | |
tree | 07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2 opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs index c951653..31eefb1 100644 --- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | |||
@@ -54,9 +54,10 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | private IGatekeeperService m_GatekeeperService; | 55 | private IGatekeeperService m_GatekeeperService; |
56 | 56 | ||
57 | public GatekeeperAgentHandler(IGatekeeperService gatekeeper) | 57 | public GatekeeperAgentHandler(IGatekeeperService gatekeeper, bool proxy) |
58 | { | 58 | { |
59 | m_GatekeeperService = gatekeeper; | 59 | m_GatekeeperService = gatekeeper; |
60 | m_Proxy = proxy; | ||
60 | } | 61 | } |
61 | 62 | ||
62 | protected override bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) | 63 | protected override bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) |