diff options
| author | UbitUmarov | 2015-11-01 03:25:36 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-01 03:25:36 +0000 |
| commit | 24472c3b67f0b79a8541093a63e2f0e859543117 (patch) | |
| tree | c542d8c8a0fb90b5c206fcffe633d83b5b554ceb /OpenSim/Services/HypergridService/GatekeeperService.cs | |
| parent | Merge branch 'master' into avinationmerge (diff) | |
| download | opensim-SC_OLD-24472c3b67f0b79a8541093a63e2f0e859543117.zip opensim-SC_OLD-24472c3b67f0b79a8541093a63e2f0e859543117.tar.gz opensim-SC_OLD-24472c3b67f0b79a8541093a63e2f0e859543117.tar.bz2 opensim-SC_OLD-24472c3b67f0b79a8541093a63e2f0e859543117.tar.xz | |
fix merge issues
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 692ef06..8e10125 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -454,7 +454,6 @@ namespace OpenSim.Services.HypergridService | |||
| 454 | 454 | ||
| 455 | EntityTransferContext ctx = new EntityTransferContext(); | 455 | EntityTransferContext ctx = new EntityTransferContext(); |
| 456 | 456 | ||
| 457 | string myversion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion); | ||
| 458 | if (!m_SimulationService.QueryAccess( | 457 | if (!m_SimulationService.QueryAccess( |
| 459 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), | 458 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), |
| 460 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) | 459 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) |