diff options
| author | UbitUmarov | 2015-11-01 03:01:59 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-01 03:01:59 +0000 |
| commit | 72684592ba196095311b308407cbe5751c6dd8dd (patch) | |
| tree | c51a1fb67c6d425b1cb904e788bac8a720d951c8 /OpenSim/Services/HypergridService | |
| parent | fix cut points of UTF-8 strings (diff) | |
| parent | Minor: Add an initializer to show what the default value would be. (diff) | |
| download | opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.zip opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.gz opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.bz2 opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.xz | |
Merge branch 'master' into avinationmerge
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to 'OpenSim/Services/HypergridService')
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index bee3db3..692ef06 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -452,12 +452,12 @@ namespace OpenSim.Services.HypergridService | |||
| 452 | 452 | ||
| 453 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0}, Teleport Flags: {1}", aCircuit.Name, loginFlag); | 453 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0}, Teleport Flags: {1}", aCircuit.Name, loginFlag); |
| 454 | 454 | ||
| 455 | string version; | 455 | EntityTransferContext ctx = new EntityTransferContext(); |
| 456 | 456 | ||
| 457 | string myversion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion); | 457 | string myversion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion); |
| 458 | if (!m_SimulationService.QueryAccess( | 458 | if (!m_SimulationService.QueryAccess( |
| 459 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), | 459 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), |
| 460 | true, aCircuit.startpos, myversion, new List<UUID>(), out version, out reason)) | 460 | true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) |
| 461 | return false; | 461 | return false; |
| 462 | 462 | ||
| 463 | return m_SimulationService.CreateAgent(source, destination, aCircuit, (uint)loginFlag, out reason); | 463 | return m_SimulationService.CreateAgent(source, destination, aCircuit, (uint)loginFlag, out reason); |