diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 3 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 87c6810..bee3db3 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -454,9 +454,10 @@ namespace OpenSim.Services.HypergridService | |||
454 | 454 | ||
455 | string version; | 455 | string version; |
456 | 456 | ||
457 | string myversion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion); | ||
457 | if (!m_SimulationService.QueryAccess( | 458 | if (!m_SimulationService.QueryAccess( |
458 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), | 459 | destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), |
459 | true, aCircuit.startpos, "SIMULATION/0.3", new List<UUID>(), out version, out reason)) | 460 | true, aCircuit.startpos, myversion, new List<UUID>(), out version, out reason)) |
460 | return false; | 461 | return false; |
461 | 462 | ||
462 | return m_SimulationService.CreateAgent(source, destination, aCircuit, (uint)loginFlag, out reason); | 463 | return m_SimulationService.CreateAgent(source, destination, aCircuit, (uint)loginFlag, out reason); |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 847cc07..5829212 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -993,11 +993,11 @@ 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 | string version; | 997 | string version; |
997 | 998 | ||
998 | if ( | 999 | if (!simConnector.QueryAccess( |
999 | !simConnector.QueryAccess( | 1000 | region, aCircuit.AgentID, null, true, aCircuit.startpos, myversion, new List<UUID>(), out version, out reason)) |
1000 | region, aCircuit.AgentID, null, true, aCircuit.startpos, "SIMULATION/0.3", new List<UUID>(), out version, out reason)) | ||
1001 | return false; | 1001 | return false; |
1002 | 1002 | ||
1003 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); | 1003 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); |