diff options
author | Diva Canto | 2015-10-18 16:06:31 -0700 |
---|---|---|
committer | Diva Canto | 2015-10-18 16:24:33 -0700 |
commit | 7ab633461ed65d1080b569532020379a068352b5 (patch) | |
tree | ec1efcb5e8d207e62b494f4d3ce404d6d61e1aaf /OpenSim/Services/LLLoginService/LLLoginService.cs | |
parent | The protocol version checking on the grid server connector seemed to have a b... (diff) | |
download | opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.zip opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.gz opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.bz2 opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.xz |
Fixed merge conflicts
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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); |