diff options
author | Melanie Thielker | 2015-11-02 00:23:38 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-11-02 00:23:38 +0100 |
commit | f88e4a1ec914ddaa9680a62faf96241b87fd0e06 (patch) | |
tree | 5c58976397d044bf9d18e78409bb846139f13016 /OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |
parent | Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into avin... (diff) | |
download | opensim-SC_OLD-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.zip opensim-SC_OLD-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.gz opensim-SC_OLD-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.bz2 opensim-SC_OLD-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.xz |
Plumb the rest of the context stuff. Well, what I see so far anyway
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs index e787f7c..367c481 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
@@ -118,7 +118,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
118 | 118 | ||
119 | 119 | ||
120 | protected override bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination, | 120 | protected override bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination, |
121 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) | 121 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, EntityTransferContext ctx, out string reason) |
122 | { | 122 | { |
123 | return m_UserAgentService.LoginAgentToGrid(source, aCircuit, gatekeeper, destination, fromLogin, out reason); | 123 | return m_UserAgentService.LoginAgentToGrid(source, aCircuit, gatekeeper, destination, fromLogin, out reason); |
124 | } | 124 | } |