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/LLLoginService | |
| 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/LLLoginService')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 619a527..6681f1a 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -999,7 +999,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 999 | region, aCircuit.AgentID, null, true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) | 999 | region, aCircuit.AgentID, null, true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) |
| 1000 | return false; | 1000 | return false; |
| 1001 | 1001 | ||
| 1002 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); | 1002 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, ctx, out reason); |
| 1003 | } | 1003 | } |
| 1004 | 1004 | ||
| 1005 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) | 1005 | private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) |