diff options
| author | Melanie Thielker | 2015-11-01 19:11:14 +0100 |
|---|---|---|
| committer | Melanie Thielker | 2015-11-01 19:11:14 +0100 |
| commit | 69585a4824a7814bbe543d624de6c3627e0b927b (patch) | |
| tree | 5d4bb6480906000f019c0d456939b24f5dfd8ab4 /OpenSim/Services/Connectors/Hypergrid | |
| parent | Merge branch 'master' into avinationmerge (diff) | |
| download | opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.zip opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.gz opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.bz2 opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.xz | |
More plumbing of the EntityTransferContext (not yet complete)
Diffstat (limited to 'OpenSim/Services/Connectors/Hypergrid')
| -rw-r--r-- | OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 8abd046..1dcc82a 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
| @@ -138,7 +138,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
| 138 | Console.WriteLine(" >>> LoginAgentToGrid <<< " + home.ServerURI); | 138 | Console.WriteLine(" >>> LoginAgentToGrid <<< " + home.ServerURI); |
| 139 | 139 | ||
| 140 | uint flags = fromLogin ? (uint)TeleportFlags.ViaLogin : (uint)TeleportFlags.ViaHome; | 140 | uint flags = fromLogin ? (uint)TeleportFlags.ViaLogin : (uint)TeleportFlags.ViaHome; |
| 141 | return CreateAgent(source, home, aCircuit, flags, out reason); | 141 | EntityTransferContext ctx = new EntityTransferContext(); |
| 142 | return CreateAgent(source, home, aCircuit, flags, ctx, out reason); | ||
| 142 | } | 143 | } |
| 143 | 144 | ||
| 144 | 145 | ||