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 | |
| parent | Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into avin... (diff) | |
| download | opensim-SC-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.zip opensim-SC-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.gz opensim-SC-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.bz2 opensim-SC-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.xz | |
Plumb the rest of the context stuff. Well, what I see so far anyway
Diffstat (limited to 'OpenSim/Server/Handlers/Hypergrid')
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs index 95a0510..f3d678f 100644 --- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | protected override bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination, | 64 | protected override bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination, |
| 65 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) | 65 | AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, EntityTransferContext ctx, out string reason) |
| 66 | { | 66 | { |
| 67 | return m_GatekeeperService.LoginAgent(source, aCircuit, destination, out reason); | 67 | return m_GatekeeperService.LoginAgent(source, aCircuit, destination, out reason); |
| 68 | } | 68 | } |
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 | } |