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/LLLoginService/LLLoginService.cs | |
| 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/LLLoginService/LLLoginService.cs')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 5829212..619a527 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -993,11 +993,10 @@ namespace OpenSim.Services.LLLoginService | |||
| 993 | 993 | ||
| 994 | private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, TeleportFlags flags, out string reason) | 994 | private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, TeleportFlags flags, out string reason) |
| 995 | { | 995 | { |
| 996 | string myversion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion); | 996 | EntityTransferContext ctx = new EntityTransferContext(); |
| 997 | string version; | ||
| 998 | 997 | ||
| 999 | if (!simConnector.QueryAccess( | 998 | if (!simConnector.QueryAccess( |
| 1000 | region, aCircuit.AgentID, null, true, aCircuit.startpos, myversion, new List<UUID>(), out version, out reason)) | 999 | region, aCircuit.AgentID, null, true, aCircuit.startpos, new List<UUID>(), ctx, out reason)) |
| 1001 | return false; | 1000 | return false; |
| 1002 | 1001 | ||
| 1003 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); | 1002 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); |